syncing with upstream

2018-01-15 13:31:00 +01:00
parent bc646b86c2
commit fe35b0aa91
24 changed files with 325 additions and 149 deletions
--- a/requirements.txt
+++ b/requirements.txt
@@ -23,3 +23,5 @@ blinker==1.4
 Flask-OAuthlib==0.9.4
 boto3==1.4.8
 ujson==1.35
+Flask-FeatureFlags==0.6
+mock==2.0.0