Merge branch '0.17.x'

misago/__init__.py

@@ -1 +1 @@
-__version__ = '0.17.2'
+__version__ = '0.17.3'

misago/users/apps.py

@@ -1,7 +1,8 @@
 from django.apps import AppConfig
-from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 
+from misago.conf import settings
+
 from .pages import user_profile, usercp, users_list
 
 

misago/users/management/commands/deletemarkedusers.py

@@ -1,9 +1,9 @@
 from __future__ import unicode_literals
 
-from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.core.management.base import CommandError, BaseCommand
 
+from misago.conf import settings
 from misago.core.pgutils import chunk_queryset
 
 from misago.users.permissions import can_delete_own_account

misago/users/permissions/delete.py

@@ -1,7 +1,6 @@
 from datetime import timedelta
 
 from django import forms
-from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.core.exceptions import PermissionDenied
 from django.utils import timezone
@@ -11,6 +10,7 @@ from django.utils.translation import ungettext
 from misago.acl import algebra
 from misago.acl.decorators import return_boolean
 from misago.acl.models import Role
+from misago.conf import settings
 
 
 __all__ = [