diff options
| author | Tom Christie | 2013-03-12 18:49:38 +0000 | 
|---|---|---|
| committer | Tom Christie | 2013-03-12 18:49:38 +0000 | 
| commit | e8db504a9802c6dcc111a327f681e01b9b3e2e16 (patch) | |
| tree | cc85f273295484a0e145eee63b1f8d5af1701572 /docs/topics | |
| parent | 12ac357559457d1ded341728aaf76408f0417f9b (diff) | |
| parent | 20880232930dd6f3a1de9dda1546c84b9279a258 (diff) | |
| download | django-rest-framework-e8db504a9802c6dcc111a327f681e01b9b3e2e16.tar.bz2 | |
Merge master
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 bdd3e27e..b0f0cfa2 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -109,6 +109,7 @@ The following people have helped make REST framework great.  * Wiliam Souza - [waa]  * Jonas Braun - [iekadou]  * Ian Dash - [bitmonkey] +* Bouke Haarsma - [bouke]  * Pierre Dulac - [dulaccc]  Many thanks to everyone who's contributed to the project. @@ -253,4 +254,5 @@ You can also contact [@_tomchristie][twitter] directly on twitter.  [waa]: https://github.com/wiliamsouza  [iekadou]: https://github.com/iekadou  [bitmonkey]: https://github.com/bitmonkey +[bouke]: https://github.com/bouke  [dulaccc]: https://github.com/dulaccc diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index eb4d378e..ff487826 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -44,6 +44,8 @@ You can determine your currently installed version using `pip freeze`:  * Filtering backends are now applied to the querysets for object lookups as well as lists.  (Eg you can use a filtering backend to control which objects should 404)  * Deal with error data nicely when deserializing lists of objects. +* Extra override hook to configure `DjangoModelPermissions` for unauthenticated users. +* Bugfix: Fix pk relationship bug for some types of 1-to-1 relations.  * Bugfix: Workaround for Django bug causing case where `Authtoken` could be registered for cascade delete from `User` even if not installed.  ### 2.2.3  | 
