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
..
2020-10-28 08:40:11 -06:00
2020-11-21 16:14:03 +00:00
2021-05-06 14:12:43 +02:00
2020-11-03 16:38:47 -07:00