Rebecca Law e67bb5f716 Fix main_nav for platform admin ...

Renamed or_ to any_

2016-03-30 11:30:18 +01:00

..

notify_client

…

views

Add comment when adding the view_activity permission as a default.

2016-03-30 10:53:15 +01:00

__init__.py

…

test_add_service_form.py

…

test_asset_fingerprinter.py

…

test_create_api_key_form.py

…

test_encyption.py

…

test_errorhandlers.py

…

test_errors_for_csv.py

…

test_permissions.py

Fix main_nav for platform admin

2016-03-30 11:30:18 +01:00

test_two_factor_form.py

Merging conflict with two_factor.py

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

test_user.py

…

test_validators.py

Merging conflict with two_factor.py

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