Martyn Inglis 1e054ec698 Merge branch 'master' into do-not-write-test-data-to-the-history-table ...

Conflicts:
	app/user/rest.py

2016-12-19 16:47:54 +00:00

..

app

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

2016-12-19 16:47:54 +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