Martyn Inglis 42b04f0565 Merge branch 'master' into rationalise-configs ...

Conflicts:
	app/main/views/jobs.py

2016-09-07 10:34:53 +01:00

..

views

Merge branch 'master' into rationalise-configs

2016-09-07 10:34:53 +01:00

__init__.py

…

forms.py

Add a component for picking the time to send a job

2016-08-31 16:58:09 +01:00

uploader.py

…

validators.py

…