Rebecca Law ff6cad1acf Merge branch 'master' into service-not-found-returns-404 ...

Conflicts:
	app/errors.py

2016-02-25 15:33:53 +00:00

..

app

Merge branch 'master' into service-not-found-returns-404

2016-02-25 15:33:53 +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