Merge branch 'master' into celery-spike

Conflicts:
	app/__init__.py
	app/notifications/rest.py
	config.py
	wsgi.py
This commit is contained in:
Martyn Inglis
2016-02-12 09:36:49 +00:00
26 changed files with 896 additions and 429 deletions

View File

@@ -16,8 +16,6 @@ boto3==1.2.3
celery==3.1.20
redis==2.10.5
git+https://github.com/alphagov/notifications-python-client.git@0.2.1#egg=notifications-python-client==0.2.1
git+https://github.com/alphagov/notifications-python-client.git@0.2.6#egg=notifications-python-client==0.2.6
git+https://github.com/alphagov/notifications-utils.git@0.0.3#egg=notifications-utils==0.0.3
git+https://github.com/alphagov/notify-api-client.git@0.1.6#egg=notify-api-client==0.1.6