Martyn Inglis c57e2a6894 Merge branch 'master' into inbound-sms ...

Conflicts:
	app/notifications/receive_notifications.py
	tests/app/notifications/test_receive_notification.py

2017-06-01 15:56:33 +01:00

..

app

Merge branch 'master' into inbound-sms

2017-06-01 15:56:33 +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