Martyn Inglis e7a01e979b Fixed merge conflicts

2016-11-22 13:10:12 +00:00

..

app

Fixed merge conflicts

2016-11-22 13:10:12 +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