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-09-06 09:07:27 -06:00
2020-12-22 15:33:25 +00:00
2021-05-08 00:33:24 +02:00
2021-02-10 17:09:23 -07:00
2020-09-06 09:07:27 -06:00
2021-02-10 17:09:23 -07:00
2021-02-10 17:09:23 -07:00
2021-02-10 17:09:23 -07:00
2021-02-10 17:09:23 -07:00
2021-02-10 17:09:23 -07:00
2021-02-10 17:09:23 -07:00