Rebecca Law 49198b26e7 Merge branch 'master' into reset-password ...

Conflicts:
	app/schemas.py
	tests/app/celery/test_tasks.py

2016-03-09 09:36:57 +00:00

..

app

Merge branch 'master' into reset-password

2016-03-09 09:36:57 +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