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-16 01:24:49 +02:00
2020-04-01 19:05:41 +02:00
2020-10-17 16:19:57 +02:00