Rebecca Law 8ab4a5b150 Merge branch 'master' into platform-admin ...

Conflicts:
	tests/app/main/views/test_dashboard.py

2016-03-21 13:23:46 +00:00

..

assets

Move documentation into footer, not behind login

2016-03-21 10:39:57 +00:00

main

Merge branch 'master' into platform-admin

2016-03-21 13:23:46 +00:00

notify_client

Merge branch 'master' into platform-admin

2016-03-21 12:18:44 +00:00

status

…

templates

Merge branch 'master' into platform-admin

2016-03-21 13:23:46 +00:00

__init__.py

Merge branch 'master' into platform-admin

2016-03-21 12:18:44 +00: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

…