Merge branch 'master' into admin_render_dicts_better

This commit is contained in:
Tim Watts 2017-03-02 00:12:56 +01:00 committed by GitHub
commit b2c669c287

View File

@ -95,7 +95,7 @@ The following packages are optional:
* [coreapi][coreapi] (1.32.0+) - Schema generation support.
* [Markdown][markdown] (2.1.0+) - Markdown support for the browsable API.
* [django-filter][django-filter] (0.9.2+) - Filtering support.
* [django-filter][django-filter] (1.0.1+) - Filtering support.
* [django-crispy-forms][django-crispy-forms] - Improved HTML display for filtering.
* [django-guardian][django-guardian] (1.1.1+) - Object level permissions support.