Martyn Inglis 8dc7a86148 Merge branch 'master' into async-job-stats ...

Conflicts:
	app/dao/services_dao.py

2017-05-18 09:34:54 +01:00

..

app

Merge branch 'master' into async-job-stats

2017-05-18 09:34:54 +01:00

__init__.py

…

conftest.py

Add service permissions DAO and refactor user service permission mock

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