mirror of
https://gitea.mueller.network/extern/django-helpdesk.git
synced 2024-12-23 23:29:54 +01:00
Merge branch 'master' into develop
This commit is contained in:
commit
31b49ab2f6
@ -22,7 +22,11 @@ def get_staff_user(username='helpdesk.staff', password='password'):
|
||||
|
||||
def reload_urlconf(urlconf=None):
|
||||
|
||||
from importlib import reload # python 3 needs this import.
|
||||
from django.utils import six
|
||||
if six.PY2:
|
||||
from imp import reload
|
||||
else:
|
||||
from importlib import reload
|
||||
|
||||
if urlconf is None:
|
||||
from django.conf import settings
|
||||
|
Loading…
Reference in New Issue
Block a user