Merge remote-tracking branch 'gitignore/fix/syntax-python3-20170305'

# Conflicts: # cps/db.py # cps/web.py # requirements.txt
2017-03-07 20:22:28 +01:00
parent 6feb1f8894 fc10f55bd4
commit 80f1276624
9 changed files with 78 additions and 49 deletions
@@ -10,3 +10,5 @@ requests>=2.11.1
 SQLAlchemy>=0.8.4
 tornado>=4.1
 Wand>=0.4.4
+#future
+