Merge branch 'master' into postdj18

2016-09-07 10:13:44 -07:00 · 2016-09-07 10:13:44 -07:00 · 5716e04cd6
parent 9138835be7 96cabccafd
commit 5716e04cd6
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 7:00 pm PDT on Saturday, Sept 3, 2016.
+    We estimate that we will be back online at 2:00 pm EDT on Saturday, Sept 7, 2016.
 </div>
 {% endblock %}

--- a/settings/just.py
+++ b/settings/just.py
@ -154,7 +154,7 @@ AMAZON_FPS_HOST = "fps.sandbox.amazonaws.com"
 #AMAZON_FPS_HOST = "fps.amazonaws.com"

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

 # Amazon keys to permit S3 access