Merge branch 'master' into tutorial
Conflicts: endpoints/index.py static/css/quay.css static/js/app.js static/js/controllers.js test/data/test.db
This commit is contained in:
commit
98e57b9d2b
19 changed files with 1615 additions and 66 deletions
|
@ -16,7 +16,7 @@ from test import analytics as fake_analytics
|
|||
|
||||
class FlaskConfig(object):
|
||||
SECRET_KEY = '1cb18882-6d12-440d-a4cc-b7430fb5f884'
|
||||
|
||||
JSONIFY_PRETTYPRINT_REGULAR = False
|
||||
|
||||
class FlaskProdConfig(FlaskConfig):
|
||||
SESSION_COOKIE_SECURE = True
|
||||
|
|
Reference in a new issue