Scott Sadler e82c17567a Merge branch 'master' into django-1.8 ... Conflicts: helpdesk/tests/__init__.py		2015-11-06 14:50:33 +01:00
..
__init__.py	Merge branch 'master' into django-1.8	2015-11-06 14:50:33 +01:00
helpers.py	exclude KB from navigation if HELPDESK_KB_ENABLED is False (fixes #223)	2014-07-21 18:44:54 +02:00
test_navigation.py	tests renamed for compliance	2015-06-12 15:48:38 +02:00
test_per_queue_staff_membership.py	Merge branch 'master' into django-1.8	2015-11-06 14:50:33 +01:00
test_public_actions.py	tests renamed for compliance	2015-06-12 15:48:38 +02:00
test_ticket_submission.py	tests renamed for compliance	2015-06-12 15:48:38 +02:00