Jens Langhammer
69ee18e13d
Merge branch 'master' into new-forms
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
# Conflicts:
# Pipfile.lock
# authentik/api/decorators.py
# authentik/core/api/applications.py
# authentik/core/api/users.py
# authentik/events/api/event.py
# authentik/events/api/notification_transport.py
# authentik/flows/api/flows.py
# swagger.yaml
2021-03-30 10:26:18 +02:00
..
2021-03-30 10:26:18 +02:00
2021-03-05 19:09:13 +01:00
2020-11-19 14:35:43 +01:00
2020-12-05 22:08:42 +01:00