Martyn Inglis 7ecede46e5 Merge branch 'master' into proxy-to-alpha ...

Conflicts:
	config.py

2016-01-19 14:11:20 +00:00

..

app

Fixed test that had a clash on user ids

2016-01-19 13:59:45 +00:00

__init__.py

Authentication for admin client api calls where a user and service is not required.

2016-01-19 14:01:26 +00:00

conftest.py

Added versions file for initial db and fixed tests.

2016-01-12 09:56:42 +00:00