jellyfin/Emby.Server.Implementations
Patrick Barron b6446c06ee Merge branch 'master' into authenticationdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Security/AuthenticationRepository.cs
#	Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
#	MediaBrowser.Controller/Devices/IDeviceManager.cs
2021-05-21 00:19:07 -04:00
..
2021-04-17 11:37:55 +01:00
2021-04-17 11:37:55 +01:00
2021-02-23 16:45:10 +01:00
2021-05-01 15:56:16 +02:00
2021-05-16 14:49:11 +02:00
2020-07-24 16:37:54 +02:00
2021-04-17 11:19:09 +01:00
2020-10-17 16:01:36 +02:00