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-05-15 15:33:50 -06:00
2020-04-01 19:05:41 +02:00
2021-05-07 00:52:06 +02:00