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

..

assets

Improve display of failure rates

2016-03-23 13:47:54 +00:00

main

Merge branch 'master' into fix-permissions

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

notify_client

Merge with master.

2016-03-29 22:50:40 +01:00

status

Fixed pep8

2016-03-03 16:50:06 +00:00

templates

Merge branch 'master' into fix-permissions

2016-03-30 09:32:24 +01:00

__init__.py

Merging conflict with two_factor.py

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

asset_fingerprinter.py

…

its_dangerous_session.py

…

proxy_fix.py

…

utils.py

Merge branch 'master' into platform-admin

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

version.py

Fixed up the health check page

2016-03-03 16:41:21 +00:00