Martyn Inglis c437615661 Merge branch 'master' into fix-mocks ...

Conflicts:
	tests/app/notifications/test_validators.py

2016-11-29 13:32:40 +00:00

..

app

Merge branch 'master' into fix-mocks

2016-11-29 13:32:40 +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

Merge branch 'master' into active-service

2016-11-10 13:54:02 +00:00