Rebecca Law 96b0e42959 Merge branch 'master' into schedule-api-notification ...

Conflicts:
	app/celery/scheduled_tasks.py
	tests/app/celery/test_scheduled_tasks.py

2017-05-24 13:21:22 +01:00

..

app

Merge branch 'master' into schedule-api-notification

2017-05-24 13:21:22 +01:00

__init__.py

add test that if we have an exception, nothing is committed

2016-11-11 14:40:25 +00:00

conftest.py

Add service permissions DAO and refactor user service permission mock

2017-05-15 17:28:14 +01:00