Martyn Inglis 137aa1e2d2 Merge branch 'master' into refactor-send-tasks-into-shared-code ...

Conflicts:
	app/celery/provider_tasks.py
	tests/app/celery/test_provider_tasks.py

2016-09-23 09:54:53 +01:00

..

app

Merge branch 'master' into refactor-send-tasks-into-shared-code

2016-09-23 09:54:53 +01:00

__init__.py

…

conftest.py

Merge pull request #651 from alphagov/contract-tests

2016-09-05 11:31:29 +01:00