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/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,5 @@
+gunicorn==19.7.1
+meinheld==0.6.1
 Flask==0.10.1
 itsdangerous==0.24
 Jinja2==2.8
@@ -18,3 +20,6 @@ invoke==0.13.0
 dxfgrabber==0.8.1
 rollbar==0.13.11
 blinker==1.4
+Flask-OAuthlib==0.9.4
+boto3==1.4.8
+ujson==1.3.5