aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/topics/credits.md2
-rw-r--r--docs/topics/release-notes.md1
2 files changed, 3 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 c75f0879..741d908c 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -8,6 +8,7 @@
### 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.