aboutsummaryrefslogtreecommitdiffstats
path: root/docs/topics/release-notes.md
diff options
context:
space:
mode:
authorMichal Dvorak (cen38289)2012-12-21 10:53:23 +0100
committerMichal Dvorak (cen38289)2012-12-21 10:53:23 +0100
commit5ba2437f2dcb4eb7f9677ff9e393c27af38b071f (patch)
treedf19512bc58ae3180813c9d479267b7a617e9b8e /docs/topics/release-notes.md
parent8ac77eaae8d6ad01ec8f6de18134c4aa1961d4dd (diff)
parent79aea2f0d082f17e7bb75cc32bd71b5f04836d43 (diff)
downloaddjango-rest-framework-5ba2437f2dcb4eb7f9677ff9e393c27af38b071f.tar.bz2
Merge remote-tracking branch 'tom/master'
Conflicts: rest_framework/tests/serializer.py
Diffstat (limited to 'docs/topics/release-notes.md')
-rw-r--r--docs/topics/release-notes.md14
1 files changed, 14 insertions, 0 deletions
diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 66d6f7f3..6dedc3d2 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -6,6 +6,20 @@
## 2.1.x series
+### 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
+
+* Bugfix: Fix issue with M2M fields in browseable API.
+
### 2.1.10
**Date**: 17th Dec 2012