Martyn Inglis 268819284f Merge branch 'master' into capture-delivery-outcomes ...

Conflicts:
	tests/app/notifications/test_rest.py

2016-03-21 13:32:31 +00:00

..

app

Merge branch 'master' into capture-delivery-outcomes

2016-03-21 13:32:31 +00:00

__init__.py

…

conftest.py

Fix get_users_by_service to return 404 if service does not exist.

2016-02-25 12:11:51 +00:00