Martyn Inglis 7cfc58c994 Merge branch 'master' into caching-with-redis ...

Conflicts:
	app/celery/tasks.py
	tests/app/celery/test_tasks.py

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

..

app

Merge branch 'master' into caching-with-redis

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