Combine the rizmu and develop branches - fixes Django 1.9 support
#20
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vdboor
changed the title
rizmu and develop branches - fixes Django 1.9 supportrizmu and develop branches - fixes Django 1.9 support
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request combines both of external branches that fix Django 1.9 support.
The
rizmubranch has the most features, while thedevelophas other fixes.In turn this hurts Django 1.9 projects: one branch has the
mimetype -> content_typefix, the other has theimportlibfix. both are needed for Django 1.9. I've also updated theurls.pyfor Django 1.10