Rebecca Law e4e7a99f40 Merge branch 'master' into secure-endpoints ...

Conflicts:
	app/__init__.py

2017-03-17 10:24:12 +00:00

..

app

Merge branch 'master' into secure-endpoints

2017-03-17 10:24:12 +00:00

__init__.py

…

conftest.py

Add tests to verify correctness of the switching provider task

2017-02-24 12:23:39 +00:00