Adam Shimali b32f0ab2cd Resolve conflicts

2016-07-01 16:53:12 +01:00

..

__init__.py

…

celery.py

…

provider_tasks.py

Resolve conflicts

2016-07-01 16:53:12 +01: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

Move scheduled tasks into their own module.

2016-06-20 13:33:53 +01:00

tasks.py

Improve the logging message

2016-07-01 14:42:40 +01:00