merge with upstream

This commit is contained in:
Senad Uka
2017-12-19 16:53:58 +01:00
parent 197db1003b
commit 8beef5faea

View File

@@ -22,4 +22,4 @@ rollbar==0.13.11
blinker==1.4
Flask-OAuthlib==0.9.4
boto3==1.4.8
ujson==1.3.5
ujson==1.35