Rebecca Law c99df69025 Merge branch 'master' into fix-permissions ...

Conflicts:
	app/main/views/jobs.py
	tests/app/main/views/test_manage_users.py

2016-03-30 10:36:55 +01:00

..

app

Merge branch 'master' into fix-permissions

2016-03-30 10:36:55 +01:00

__init__.py

Merging conflict with two_factor.py

2016-03-30 10:11:06 +01:00

conftest.py

Merge branch 'master' into fix-permissions

2016-03-30 10:36:55 +01:00