aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/status.py
diff options
context:
space:
mode:
authorMarko Tibold2011-12-30 01:37:32 +0100
committerMarko Tibold2011-12-30 01:37:32 +0100
commit1b28339e5b733a0422c2bcd06b39e289bc98f69b (patch)
tree9e766f4f9d9ec596bc0e2702e1bb291b90aa3a93 /djangorestframework/status.py
parent91cee26ad89c04a70f33ae334150dd127f900474 (diff)
parenta0c4dca9462c738aac3c712607997b9bd1f7b2c8 (diff)
downloaddjango-rest-framework-1b28339e5b733a0422c2bcd06b39e289bc98f69b.tar.bz2
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'djangorestframework/status.py')
-rw-r--r--djangorestframework/status.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/djangorestframework/status.py b/djangorestframework/status.py
index 67704b8e..93c2a392 100644
--- a/djangorestframework/status.py
+++ b/djangorestframework/status.py
@@ -89,4 +89,4 @@ NOT_IMPLEMENTED = 501
BAD_GATEWAY = 502
SERVICE_UNAVAILABLE = 503
GATEWAY_TIMEOUT = 504
-HTTP_VERSION_NOT_SUPPORTED = 505 \ No newline at end of file
+HTTP_VERSION_NOT_SUPPORTED = 505