Rebecca Law cefa00b3fa Merge branch 'master' into fix-billable-units-query ...

Conflicts:
	tests/app/dao/test_notification_dao.py

2017-01-10 14:24:08 +00:00

..

app

Merge branch 'master' into fix-billable-units-query

2017-01-10 14:24:08 +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