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

Browse Source

Conflicts:
	djangorestframework/views.py

...

This commit is contained in:

Benoit C 2012-01-10 00:25:33 +01:00

parent 96e91f5841 94f24e2e2f

commit 35ba2fc65b

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