Merge remote-tracking branch 'tomchristie/docs' into improve-docs

Browse Source

# Conflicts:
#	rest_framework/static/rest_framework/docs/css/base.css

...

This commit is contained in:

Emmanouil Konstantinidis 2017-02-08 16:50:30 +00:00

parent c34c17d800 d37994821d

commit 223cc9447c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available