aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md8
-rw-r--r--docs/topics/release-notes.md4
-rw-r--r--rest_framework/__init__.py2
3 files changed, 12 insertions, 2 deletions
diff --git a/README.md b/README.md
index b4078b15..13a78724 100644
--- a/README.md
+++ b/README.md
@@ -60,6 +60,14 @@ To run the tests.
# Changelog
+### 2.1.12
+
+**Date**: 21st Dec 2012
+
+* Bugfix: Fix bug that could occur using ChoiceField.
+* Bugfix: Fix exception in browseable API on DELETE.
+* Bugfix: Fix issue where pk was was being set to a string if set by URL kwarg.
+
## 2.1.11
**Date**: 17th Dec 2012
diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 741d908c..6dedc3d2 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -6,7 +6,9 @@
## 2.1.x series
-### Master
+### 2.1.12
+
+**Date**: 21st Dec 2012
* Bugfix: Fix bug that could occur using ChoiceField.
* Bugfix: Fix exception in browseable API on DELETE.
diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py
index d5cac5c6..02bc6fc1 100644
--- a/rest_framework/__init__.py
+++ b/rest_framework/__init__.py
@@ -1,3 +1,3 @@
-__version__ = '2.1.11'
+__version__ = '2.1.12'
VERSION = __version__ # synonym