Merge branch 'develop' into api2

This commit is contained in:
Jeremy Stretch 2017-02-03 14:45:37 -05:00
commit a9fe39459a

View File

@ -12,7 +12,7 @@ except ImportError:
"the documentation.") "the documentation.")
VERSION = '1.8.4-dev' VERSION = '1.8.5-dev'
# Import local configuration # Import local configuration
for setting in ['ALLOWED_HOSTS', 'DATABASE', 'SECRET_KEY']: for setting in ['ALLOWED_HOSTS', 'DATABASE', 'SECRET_KEY']: