Replacing undocumented ADMIN_URL setting
Update settings.rst (discontinued settings)

See #200
Update settings.rst: sorted discontinued settings
Update settings.rst: fix formatting
fix setting import (fixes CI error)
Merge pull request #226 from brente/docfix

Docs: discontinued settings + formatting fix
Merge pull request #227 from brente/master

fix setting import (fixes CI error)
use django.utils.dates.MONTHS_3 for short month names (resolves #225)
exclude KB from navigation if HELPDESK_KB_ENABLED is False (fixes #223)
Merge commit '21e46f010dfecea1562a4d2b308fd78b71fec8a0' into no-admin-url

Conflicts:
	helpdesk/urls.py
fix unquoted urls in template
Merge pull request #228 from brente/master

use django.utils.dates.MONTHS_3 for short month names
Merge pull request #230 from brente/navigation-nokb

exclude KB from navigation if HELPDESK_KB_ENABLED is False
Merge pull request #231 from brente/no-admin-url

Remove undocumented ADMIN_URL setting
Merge branch 'master' into custom-staff-filter

Conflicts:
	docs/settings.rst
	helpdesk/views/staff.py