diff options
| author | Tom Christie | 2013-08-27 20:58:30 +0100 | 
|---|---|---|
| committer | Tom Christie | 2013-08-27 20:58:30 +0100 | 
| commit | e1b54f2a2a078b3f1f9ba67f216d127b8182b100 (patch) | |
| tree | 24563d2badbe0bf3df2b84bc211bc1f4894a0572 /rest_framework/settings.py | |
| parent | ea6eee304c230a9277fdc76f4ac91654e0019b7a (diff) | |
| parent | 7fb3f078f0973acc1d108d8c617b26b6845599f7 (diff) | |
| download | django-rest-framework-e1b54f2a2a078b3f1f9ba67f216d127b8182b100.tar.bz2 | |
Merge branch 'max_paginate_by' of git://github.com/alexander-akhmetov/django-rest-framework into alexander-akhmetov-max_paginate_by
Diffstat (limited to 'rest_framework/settings.py')
| -rw-r--r-- | rest_framework/settings.py | 1 | 
1 files changed, 1 insertions, 0 deletions
| diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 2ee15ac7..8c084751 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -67,6 +67,7 @@ DEFAULTS = {      # Pagination      'PAGINATE_BY': None,      'PAGINATE_BY_PARAM': None, +    'MAX_PAGINATE_BY': None,      # Authentication      'UNAUTHENTICATED_USER': 'django.contrib.auth.models.AnonymousUser', | 
