aboutsummaryrefslogtreecommitdiffstats
path: root/docs/topics/release-notes.md
diff options
context:
space:
mode:
authorMark Aaron Shirley2012-12-19 15:24:22 -0800
committerMark Aaron Shirley2012-12-19 15:24:22 -0800
commit2f5582a1a6d8a79bfab7ffbc2d8b602fdae8e640 (patch)
tree12e82ef942a21d456b33f6aacf90784a81feddc1 /docs/topics/release-notes.md
parent5c680c36e435ffa29ba6ed5f439d22ea4e849c67 (diff)
parentc27295dcbdf89b3cbc10d6325833e428c66c0f2a (diff)
downloaddjango-rest-framework-2f5582a1a6d8a79bfab7ffbc2d8b602fdae8e640.tar.bz2
Merge remote-tracking branch 'upstream/master' into related-required
Diffstat (limited to 'docs/topics/release-notes.md')
-rw-r--r--docs/topics/release-notes.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 87aaefbd..741d908c 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -8,6 +8,8 @@
### Master
+* 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