Merge branch 'dj18' into postdj18

2016-09-08 18:28:55 -07:00 · 2016-09-08 18:28:55 -07:00 · a844747b65
parent 1335fe59d2 40971359a7
commit a844747b65
2 changed files with 2 additions and 2 deletions
--- a/frontend/templates/503.html
+++ b/frontend/templates/503.html
@ -2,7 +2,7 @@

 {% block news %}
 <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>
 {% endblock %}

--- a/settings/prod.py
+++ b/settings/prod.py
@ -153,7 +153,7 @@ CELERYBEAT_SCHEDULE['refresh_acqs'] = NOTIFY_UNCLAIMED_GIFTS
 AMAZON_FPS_HOST = "fps.amazonaws.com"

 # local settings for maintenance mode
-MAINTENANCE_MODE = False
+MAINTENANCE_MODE = True

 # Amazon keys to permit S3 access
 DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage'