Merge remote-tracking branch 'upstream/master'

This commit is contained in:
pwhipp
2014-07-09 16:22:41 +10:00
31 changed files with 479 additions and 497 deletions

View File

@@ -251,6 +251,12 @@ SERIALIZATION_MODULES = {
SOUTH_MIGRATION_MODULES = {
'taggit': 'taggit.south_migrations',
}
# ---------- Django REST framework -----------
REST_FRAMEWORK = {
'PAGINATE_BY': 10,
'PAGINATE_BY_PARAM': 'page_size',
'MAX_PAGINATE_BY': 100,
}
try:
from settings_local import *