encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-02-09 08:00:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* '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
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_framework/settings.py
View File

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