Merge branch 'dj18' into postdj18

pull/1/head
Raymond Yee 2016-09-08 18:28:55 -07:00
commit a844747b65
2 changed files with 2 additions and 2 deletions

View File

@ -2,7 +2,7 @@
{% block news %} {% block news %}
<div class="launch_top"> <div class="launch_top">
We estimate that we will be back online at 2:00 pm EDT on Saturday, Sept 7, 2016. We estimate that we will be back online at 6:00 am EDT on Friday, Sept 9, 2016.
</div> </div>
{% endblock %} {% endblock %}

View File

@ -153,7 +153,7 @@ CELERYBEAT_SCHEDULE['refresh_acqs'] = NOTIFY_UNCLAIMED_GIFTS
AMAZON_FPS_HOST = "fps.amazonaws.com" AMAZON_FPS_HOST = "fps.amazonaws.com"
# local settings for maintenance mode # local settings for maintenance mode
MAINTENANCE_MODE = False MAINTENANCE_MODE = True
# Amazon keys to permit S3 access # Amazon keys to permit S3 access
DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage' DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage'