diff options
| author | Mark Aaron Shirley | 2012-12-19 15:24:22 -0800 |
|---|---|---|
| committer | Mark Aaron Shirley | 2012-12-19 15:24:22 -0800 |
| commit | 2f5582a1a6d8a79bfab7ffbc2d8b602fdae8e640 (patch) | |
| tree | 12e82ef942a21d456b33f6aacf90784a81feddc1 /docs/topics | |
| parent | 5c680c36e435ffa29ba6ed5f439d22ea4e849c67 (diff) | |
| parent | c27295dcbdf89b3cbc10d6325833e428c66c0f2a (diff) | |
| download | django-rest-framework-2f5582a1a6d8a79bfab7ffbc2d8b602fdae8e640.tar.bz2 | |
Merge remote-tracking branch 'upstream/master' into related-required
Diffstat (limited to 'docs/topics')
| -rw-r--r-- | docs/topics/credits.md | 2 | ||||
| -rw-r--r-- | docs/topics/release-notes.md | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/docs/topics/credits.md b/docs/topics/credits.md index c169fd74..fa378cb2 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -79,6 +79,7 @@ The following people have helped make REST framework great. * Colin Murtaugh - [cmurtaugh] * Simon Pantzare - [pilt] * Szymon Teżewski - [sunscrapers] +* Joel Marcotte - [joual] Many thanks to everyone who's contributed to the project. @@ -193,3 +194,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [cmurtaugh]: https://github.com/cmurtaugh [pilt]: https://github.com/pilt [sunscrapers]: https://github.com/sunscrapers +[joual]: https://github.com/joual 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 |