aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/__init__.py
diff options
context:
space:
mode:
authorCraig de Stigter2013-05-18 10:23:26 +0200
committerCraig de Stigter2013-05-18 10:23:26 +0200
commitc56d5f8f63673e2d0235015e67d78f8e0e1d7550 (patch)
treebf96abef843accae2439413de45095de2995f473 /rest_framework/__init__.py
parent84be169353f0dd2ceb06fe459b72aa2452fcbeb5 (diff)
parent34776da9249a5d73f822b3562bc56a5674b10ac7 (diff)
downloaddjango-rest-framework-c56d5f8f63673e2d0235015e67d78f8e0e1d7550.tar.bz2
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'rest_framework/__init__.py')
-rw-r--r--rest_framework/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py
index 29f3d7bc..0b1e67fb 100644
--- a/rest_framework/__init__.py
+++ b/rest_framework/__init__.py
@@ -1,6 +1,9 @@
-__version__ = '2.2.1'
+__version__ = '2.3.3'
VERSION = __version__ # synonym
# Header encoding (see RFC5987)
HTTP_HEADER_ENCODING = 'iso-8859-1'
+
+# Default datetime input and output formats
+ISO_8601 = 'iso-8601'