Rebecca Law c6df84a8f3 Merge branch 'master' into do-not-write-test-data-to-the-history-table ...

Conflicts:
	app/dao/notifications_dao.py

2016-12-21 09:57:17 +00:00

..

app

Merge branch 'master' into do-not-write-test-data-to-the-history-table

2016-12-21 09:57:17 +00:00

__init__.py

add test that if we have an exception, nothing is committed

2016-11-11 14:40:25 +00:00

conftest.py

dont let user update prov details version, and refactor tests

2016-12-19 17:13:10 +00:00