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-06-06 13:56:38 +02:00
2021-08-05 20:23:32 +02:00
2021-04-02 11:47:03 +02:00
2021-06-16 12:41:34 +02:00
2020-11-23 14:24:42 +01:00
2021-07-26 22:49:17 +02:00
2021-06-20 17:27:54 +02:00