Patrick Barron
45f478f63e
Merge branch 'master' into authenticationdb-efcore
# Conflicts:
# Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
# MediaBrowser.Controller/Library/IUserManager.cs
# MediaBrowser.Controller/Security/IAuthenticationRepository.cs
# MediaBrowser.Controller/Session/ISessionManager.cs
2021-08-13 21:08:24 -04:00
..
2021-07-26 23:02:32 +02:00
2021-05-07 14:43:50 +02:00
2021-07-26 23:02:32 +02:00
2021-07-26 23:02:32 +02:00
2021-07-26 23:02:32 +02:00
2021-07-26 23:02:32 +02:00
2021-05-07 14:43:50 +02:00
2021-05-07 14:43:50 +02:00
2021-05-24 20:35:07 +02:00
2021-05-18 18:09:46 -04:00
2021-05-07 14:43:50 +02:00
2021-05-07 14:43:50 +02:00
2021-02-20 23:34:15 +01:00
2021-05-07 14:43:50 +02:00
2020-08-20 21:04:57 +02:00
2020-08-20 21:04:57 +02:00