diff options
| author | José Padilla | 2015-02-01 15:34:33 -0400 |
|---|---|---|
| committer | José Padilla | 2015-02-01 15:34:33 -0400 |
| commit | b844cc4bb6b53e2bac4ce1351b22f44a82b7b937 (patch) | |
| tree | f508468e09d32d1e4a4283ddce7e71a16526afa2 /docs | |
| parent | 37dce89354ab2c94fefeb0a20b6265fef98caddc (diff) | |
| parent | e63f49bd1d55501f766ca2e3f9c0c9fa3cfa19ab (diff) | |
| download | django-rest-framework-b844cc4bb6b53e2bac4ce1351b22f44a82b7b937.tar.bz2 | |
Merge remote-tracking branch 'upstream/version-3.1' into version-3.1
Conflicts:
rest_framework/serializers.py
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/topics/3.1-announcement.md | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/docs/topics/3.1-announcement.md b/docs/topics/3.1-announcement.md index a0ad9829..5f4a8d45 100644 --- a/docs/topics/3.1-announcement.md +++ b/docs/topics/3.1-announcement.md @@ -1,7 +1,17 @@ -# Versioning +# Django REST framework 3.1 -# Pagination +## Pagination -# Internationalization +#### Pagination controls in the browsable API. -# ModelSerializer API +#### New schemes, including cursor pagination. + +#### Support for header-based pagination. + +## Versioning + +## Internationalization + +## New fields + +## ModelSerializer API |