Jens Langhammer
a43fb026a0
Merge branch 'version-2021.7'
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
# Conflicts:
# authentik/core/api/users.py
# authentik/providers/saml/processors/metadata_parser.py
# web/src/pages/sources/oauth/OAuthSourceForm.ts
# web/src/pages/sources/plex/PlexSourceForm.ts
# web/src/pages/users/UserForm.ts
2021-08-05 20:23:32 +02:00
..
2021-07-29 11:30:30 +02:00
2021-07-29 11:30:30 +02:00
2021-08-05 19:23:03 +02:00
2021-05-03 23:19:22 +02:00
2021-07-18 21:45:08 +02:00
2021-08-05 18:20:24 +02:00
2021-07-29 11:30:30 +02:00
2021-07-29 11:30:30 +02:00