diff options
| author | Tom Christie | 2013-09-10 20:21:15 +0100 |
|---|---|---|
| committer | Tom Christie | 2013-09-10 20:21:15 +0100 |
| commit | 75fb4b02b40da04f16c6c288bbe20ea0bc0b4154 (patch) | |
| tree | 97e7b26506eed113a15d00ae8e9d8f438e0bef60 /docs | |
| parent | f5c34926d6a4b4b29fb083d25b99b10d7431eee4 (diff) | |
| parent | 23fc9dd53fcd9cc25e2c77e5ffae395f04d4990d (diff) | |
| download | django-rest-framework-75fb4b02b40da04f16c6c288bbe20ea0bc0b4154.tar.bz2 | |
Merge branch 'master' of git://github.com/bwreilly/django-rest-framework into bwreilly-master
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/index.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/index.md b/docs/index.md index e0a2e911..d83fbff1 100644 --- a/docs/index.md +++ b/docs/index.md @@ -42,6 +42,7 @@ The following packages are optional: * [django-filter][django-filter] (0.5.4+) - Filtering support. * [django-oauth-plus][django-oauth-plus] (2.0+) and [oauth2][oauth2] (1.5.211+) - OAuth 1.0a support. * [django-oauth2-provider][django-oauth2-provider] (0.2.3+) - OAuth 2.0 support. +* [django-guardian][django-guardian] (1.1.1+) - Object level permissions support. **Note**: The `oauth2` Python package is badly misnamed, and actually provides OAuth 1.0a support. Also note that packages required for both OAuth 1.0a, and OAuth 2.0 are not yet Python 3 compatible. |