Merge branch 'master' into proxy-to-alpha

This commit is contained in:
Martyn Inglis
2016-01-19 13:49:54 +00:00
21 changed files with 480 additions and 276 deletions

View File

@@ -10,6 +10,7 @@ marshmallow==2.4.2
marshmallow-sqlalchemy==0.8.0
flask-marshmallow==0.6.2
itsdangerous==0.24
Flask-Bcrypt==0.6.2
git+https://github.com/alphagov/notifications-python-client.git@0.1.5#egg=notifications-python-client==0.1.5