Martyn Inglis cc720b137f Merge branch 'master' into email-templates ...

Conflicts:
	app/user/rest.py

2016-02-19 17:33:28 +00:00

..

__init__.py

Work in progress, skeleton of the api created and testing started. Need to fix authentication tests.

2016-01-08 17:51:46 +00:00

test_rest_verify.py

Use dashes in the celery queue names

2016-02-18 11:18:35 +00:00

test_rest.py

Fix all other dependant classes that are affected by the DAO / Service / Model changes

2016-02-19 15:54:11 +00:00