merge with upstream master

2017-12-19 15:18:35 +01:00
parent efb4547a37
commit 197db1003b
85 changed files with 2522 additions and 697 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-web: python helix/main.py
+web: gunicorn -c gunicorn_config.py --pythonpath helix main:app