Rebecca Law a1ef676fab Merge branch 'master' into platform-admin ...

Conflicts:
	app/main/views/send.py

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

..

assets

Merge pull request #295 from alphagov/resize-textbox

2016-03-18 15:24:55 +00:00

main

Merge branch 'master' into platform-admin

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

notify_client

Merge branch 'master' into platform-admin

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

status

Fixed pep8

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

templates

Merge branch 'master' into platform-admin

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

Fix for bug of cookie expiry.

2016-02-15 11:43:16 +00:00

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