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-02-06 15:56:21 +00:00
2021-02-20 19:13:50 +01:00
2021-03-23 16:05:37 +01:00
2021-03-24 09:22:15 +01:00
2020-12-13 18:46:36 +01:00
2021-03-30 10:05:14 +02:00
2020-12-05 22:08:42 +01:00
2021-03-29 21:04:54 +02:00
2021-02-03 21:18:31 +01:00
2020-12-05 22:08:42 +01:00
2021-01-28 22:50:13 +01:00
2021-02-06 20:52:52 +01:00
2021-02-06 18:07:13 +01:00
2020-12-05 22:08:42 +01:00
2021-02-07 13:39:33 +01:00