Nicholas Staples ff9d3d72ad Fixed merge conflicts with master. ...

Code quality fixes.

2016-03-30 10:26:01 +01:00

..

assets

Improve display of failure rates

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

main

Fixed merge conflicts with master.

2016-03-30 10:26:01 +01:00

notify_client

Merge with master.

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

status

…

templates

After sending sms or email to self or batch then then back button

2016-03-29 16:23:01 +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

…