Martyn Inglis 1ff4ebad5c Merge branch 'master' into client-callbacks ...

Conflicts:
	app/notifications/rest.py
	tests/app/celery/test_tasks.py

2016-03-14 11:45:21 +00:00

..

app

Merge branch 'master' into client-callbacks

2016-03-14 11:45:21 +00:00

__init__.py

bumped client version

2016-02-09 18:48:02 +00:00

conftest.py

Fix get_users_by_service to return 404 if service does not exist.

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