Patrick Barron
be88efce3c
Merge branch 'master' into authenticationdb-efcore
# Conflicts:
# Emby.Server.Implementations/Devices/DeviceManager.cs
# Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
# Emby.Server.Implementations/Security/AuthenticationRepository.cs
# Emby.Server.Implementations/Session/SessionManager.cs
# Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
# MediaBrowser.Controller/Library/IUserManager.cs
# MediaBrowser.Controller/Net/ISessionContext.cs
2021-06-18 18:56:10 -04:00
..
2021-05-07 00:39:20 +02:00
2021-06-06 17:16:41 +02:00
2021-05-20 23:56:59 -04:00
2021-05-20 23:56:59 -04:00
2021-06-18 18:56:10 -04:00
2021-06-11 23:36:10 +02:00
2020-11-28 11:21:53 +01:00
2020-11-28 11:21:53 +01:00
2021-05-07 00:39:20 +02:00
2021-06-06 17:16:41 +02:00
2021-05-07 00:39:20 +02:00