aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/__init__.py
diff options
context:
space:
mode:
authorTom Christie2013-03-15 19:25:12 +0000
committerTom Christie2013-03-15 19:25:12 +0000
commit1aedf57f4a1eb7261162977944fe233b00d63b59 (patch)
treeb091b5e765c5cbe03449961643b6887e5acb9b24 /rest_framework/__init__.py
parentb6b686d285e376dbf4f2d2f15bd0e3ef0f1c3a37 (diff)
parent22a389d0ba4dd5ac7b4fa3839491ec2708bbe7df (diff)
downloaddjango-rest-framework-1aedf57f4a1eb7261162977944fe233b00d63b59.tar.bz2
Merge branch 'master' into basic-nested-serialization
Diffstat (limited to 'rest_framework/__init__.py')
-rw-r--r--rest_framework/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py
index 1f5d6e62..cf005636 100644
--- a/rest_framework/__init__.py
+++ b/rest_framework/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '2.2.3'
+__version__ = '2.2.4'
VERSION = __version__ # synonym