2 commits

Author	SHA1	Message	Date
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