Merge branch 'master' into rename-tasks-final-deploy

Browse Source

Conflicts:
	app/celery/tasks.py

...

This commit is contained in:

Rebecca Law

2016-06-15 16:49:20 +01:00

parent 0200d3ab11 2fab40a1a5

commit 3c912b6cee

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available