Merge branch 'master' into refactor-s3-upload

Conflicts:
	requirements.txt
This commit is contained in:
Rebecca Law
2017-04-10 11:44:56 +01:00
13 changed files with 128 additions and 91 deletions

View File

@@ -32,3 +32,4 @@ awscli>=1.11,<1.12
awscli-cwlogs>=1.4,<1.5
git+https://github.com/alphagov/notifications-utils.git@15.0.3#egg=notifications-utils==15.0.3