Rebecca Law 402f55be23 Merge branch 'master' into platform-admin ...

Conflicts:
	app/__init__.py
	app/main/views/add_service.py
	app/main/views/jobs.py
	app/templates/main_nav.html
	tests/app/main/views/test_dashboard.py
	tests/conftest.py

2016-03-18 16:32:10 +00:00

3.4 KiB

Raw Blame History

View Raw