Nicholas Staples 7d43b4265f Merge and fix conflicts.

2016-03-01 11:59:50 +00:00

..

app

Merge and fix conflicts.

2016-03-01 11:59:50 +00:00

__init__.py

…

conftest.py

Fix get_users_by_service to return 404 if service does not exist.

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