Merge branch 'master' into remove-nasty-query-from-dashboard

Conflicts:
	app/service/rest.py
	tests/app/service/test_rest.py
This commit is contained in:
Martyn Inglis
2017-06-01 13:11:54 +01:00
64 changed files with 2012 additions and 648 deletions
+1
View File
@@ -20,6 +20,7 @@ jsonschema==2.5.1
gunicorn==19.6.0
docopt==0.6.2
six==1.10.0
iso8601==0.1.11
# pin to minor version 3.1.x
notifications-python-client>=3.1,<3.2