Martyn Inglis 5666719a92 Merge branch 'master' into more_wording_changes ...

Conflicts:
	app/templates/views/verify-mobile.html

2016-08-22 12:54:10 +01:00

..

assets

Delete spacer.png

2016-08-08 12:00:00 +01:00

main

send organisation back in correct variable

2016-08-15 11:15:49 +01:00

notify_client

send organisation back in correct variable

2016-08-15 11:15:49 +01:00

status

…

templates

Merge branch 'master' into more_wording_changes

2016-08-22 12:54:10 +01:00

__init__.py

remove print

2016-08-16 14:55:23 +01:00

asset_fingerprinter.py

…

event_handlers.py

…

its_dangerous_session.py

…

proxy_fix.py

…

statistics_utils.py

add tests for get_dashboard_totals

2016-07-20 14:12:22 +01:00

utils.py

…

version.py

Fixed the test environment / run scripts

2016-07-29 10:23:26 +01:00