Skip to content

Markdown compat (overtakes #3604) #3842

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xordoquy merged 6 commits into from
Jan 19, 2016
+14 −5
Merged

Markdown compat (overtakes #3604) #3842

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
276bc3b
Remove safe_mode since it is not safe.
mjschultz Nov 5, 2015
d9d34e4
Use full python dot path to extension
mjschultz Nov 5, 2015
b2e74fb
Use markdown 2.6 extension_configs to configure extension
mjschultz Nov 5, 2015
abc6fa0
Markdown 2.1 compatible
mjschultz Nov 9, 2015
f308900
Bump the markdown optional requirement as well
mjschultz Nov 9, 2015
8ea7d6b
Merge remote-tracking branch 'origin/master' into markdown-compat
xordoquy Jan 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge remote-tracking branch 'origin/master' into markdown-compat 
Conflicts:
	requirements/requirements-optionals.txt
  • Loading branch information
@xordoquy
xordoquy committed Jan 19, 2016
commit 8ea7d6b5c66c5826636f9f6c869f62ed24adc487
2 changes: 1 addition & 1 deletion requirements/requirements-optionals.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Optional packages which may be used with REST framework.
markdown==2.6.4
django-guardian==1.3.0
django-guardian==1.3.2
django-filter==0.10.0
You are viewing a condensed version of this merge commit. You can view the full changes here.