Commit 35ba2fc6 by Benoit C

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

Conflicts:
	djangorestframework/views.py
parents 96e91f58 94f24e2e
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment