Martyn Inglis fd7eb54d10 Merge branch 'master' into delete-expired-things ...

Conflicts:
	app/celery/tasks.py
	tests/app/celery/test_tasks.py
	tests/app/dao/test_notification_dao.py

2016-03-10 09:48:29 +00:00

..

app

Merge branch 'master' into delete-expired-things

2016-03-10 09:48:29 +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