Merge branch 'master' into postdj18

pull/1/head
Raymond Yee 2016-09-07 10:13:44 -07:00
commit 5716e04cd6
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 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> </div>
{% endblock %} {% endblock %}

View File

@ -154,7 +154,7 @@ AMAZON_FPS_HOST = "fps.sandbox.amazonaws.com"
#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