Merge branch 'restframework2' of git://github.com/tomchristie/django-rest-framework into improved-view-decorators

* 'restframework2' of git://github.com/tomchristie/django-rest-framework:
  Add missing comma
This commit is contained in:
Jamie Matthews 2012-09-26 13:09:39 +01:00
commit 4be937a9b3

View File

@ -28,7 +28,7 @@ DEFAULTS = {
),
'DEFAULT_PARSERS': (
'rest_framework.parsers.JSONParser',
'rest_framework.parsers.FormParser'
'rest_framework.parsers.FormParser',
'rest_framework.parsers.MultiPartParser'
),
'DEFAULT_AUTHENTICATION': (