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-12 20:15:35 +02:00
2021-05-29 21:47:35 +02:00
2021-08-01 13:07:50 +02:00
2021-08-05 20:23:32 +02:00
2021-08-05 17:17:19 +00:00
2021-06-30 19:07:11 +02:00
2021-08-05 19:23:03 +02:00
2021-06-19 15:24:51 +02:00
2021-05-29 21:47:35 +02:00
2021-08-01 18:22:50 +02:00
2021-08-05 19:26:25 +02:00
2021-06-19 19:52:55 +02:00
2021-03-20 23:35:05 +01:00
2021-05-29 21:56:09 +02:00
2021-05-31 17:08:39 +02:00