Martyn Inglis 2a2ef34339 Merge branch 'master' into caching-with-redis ...

Conflicts:
	app/__init__.py

2016-11-23 09:12:11 +00:00

..

app

Merge branch 'master' into caching-with-redis

2016-11-23 09:12:11 +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