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-11 13:55:46 +02:00
2021-05-11 13:55:46 +02:00
2021-06-12 00:20:54 +02:00
2020-08-22 21:56:24 +02:00
2020-06-16 10:37:52 +12:00
2021-05-07 00:39:20 +02:00
2021-05-07 00:39:20 +02:00
2020-04-01 19:05:41 +02:00
2020-08-22 21:56:24 +02:00
2021-05-07 00:39:20 +02:00
2021-05-07 00:39:20 +02:00
2021-05-07 00:39:20 +02:00
2020-06-16 10:37:52 +12:00
2021-05-07 00:39:20 +02:00
2021-06-06 17:16:41 +02:00
2020-08-22 21:56:24 +02:00
2021-06-06 17:16:41 +02:00
2021-06-18 18:56:10 -04:00
2021-05-07 00:39:20 +02:00
2021-05-07 00:39:20 +02:00
2021-05-07 00:39:20 +02:00
2021-04-12 00:28:17 +02:00
2021-05-07 00:39:20 +02:00
2021-05-07 00:39:20 +02:00
2021-05-07 00:39:20 +02:00
2020-08-22 21:56:24 +02:00
2021-05-07 00:39:20 +02:00
2021-05-07 00:52:06 +02:00
2021-05-07 00:39:20 +02:00