diff options
| author | Tom Christie | 2013-03-12 20:30:14 +0000 |
|---|---|---|
| committer | Tom Christie | 2013-03-12 20:30:14 +0000 |
| commit | b6b686d285e376dbf4f2d2f15bd0e3ef0f1c3a37 (patch) | |
| tree | 1ef5df29e29dfd333240212f955e5b52b69b7a91 /docs/topics | |
| parent | 2f1951910f264852b530c94c3a9946afe10eedd2 (diff) | |
| parent | 043d748b539a6f5b4cfdf6de650b072541f1c6da (diff) | |
| download | django-rest-framework-b6b686d285e376dbf4f2d2f15bd0e3ef0f1c3a37.tar.bz2 | |
Merge branch 'master' into basic-nested-serialization
Diffstat (limited to 'docs/topics')
| -rw-r--r-- | docs/topics/credits.md | 3 | ||||
| -rw-r--r-- | docs/topics/release-notes.md | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 35a302fd..b0f0cfa2 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -110,6 +110,7 @@ The following people have helped make REST framework great. * Jonas Braun - [iekadou] * Ian Dash - [bitmonkey] * Bouke Haarsma - [bouke] +* Pierre Dulac - [dulaccc] Many thanks to everyone who's contributed to the project. @@ -254,4 +255,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [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 ff487826..ac201e20 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -42,6 +42,8 @@ You can determine your currently installed version using `pip freeze`: ### Master +* OAuth 2 support. +* OAuth 1.0a support. * 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. |