Merge branch 'next'

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

# Conflicts:
#	authentik/sources/ldap/signals.py
This commit is contained in:
Jens Langhammer 2021-04-09 11:29:57 +02:00
commit 6049d91f7c
1 changed files with 1 additions and 1 deletions

View File

@ -4,7 +4,7 @@ from typing import Any
from django.db.models.signals import post_save
from django.dispatch import receiver
from django.utils.translation import gettext_lazy as _
from ldap3.core.exceptions import LDAPException, LDAPOperationResult
from ldap3.core.exceptions import LDAPOperationResult
from rest_framework.serializers import ValidationError
from authentik.core.models import User