4 commits

Author	SHA1	Message	Date
Tom Bloor	03dc114236	Fixed admin-merge test after session refactoring	2017-04-19 00:03:25 +01:00
Tom Bloor	f2f2a543fa	Moved all API endpoints under /api, fixed all tests	2017-04-06 22:43:27 +01:00
Paul Dill	5a8b5ecc2d	Update config and tests so deployment and testing use separate databases.	2017-03-08 18:52:04 +00:00
Paul Dill	c27e8d80fc	Added admin-merge API and test.	2017-03-06 03:35:49 +00:00