Merge branch 'v5-squash' into 'v5.x'

V5 Squash

See merge request allianceauth/allianceauth!1697

allianceauth/services/modules/discord/tests/test_managers.py

@@ -1,6 +1,7 @@
 import urllib
 from unittest.mock import Mock, patch
 
+from django.contrib.auth.models import User
 from requests.exceptions import HTTPError
 
 from allianceauth.tests.auth_utils import AuthUtils