Rebecca Law c6df84a8f3 Merge branch 'master' into do-not-write-test-data-to-the-history-table ...

Conflicts:
	app/dao/notifications_dao.py

2016-12-21 09:57:17 +00:00

..

__init__.py

…

celery.py

…

provider_tasks.py

fix invalid logging

2016-12-19 17:13:10 +00:00

research_mode_tasks.py

Use the notification types enum for the notifications.notification_type.

2016-06-29 11:50:54 +01:00

scheduled_tasks.py

fix logger.exception syntax

2016-10-17 17:44:17 +01:00

tasks.py

Ensure updates on a research mode service or test key don't touch the history table

2016-12-19 16:45:18 +00:00