Merge branch 'master' of https://github.com/jonlil/django-rest-framework

Browse Source

Conflicts:
	rest_framework/authtoken/migrations/0001_initial.py

...

This commit is contained in:

Jonas Liljestrand 2012-11-19 11:38:35 +01:00

parent 0bcc840927 0ce792eac2

commit acc425e74e

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