Patrick Barron 45f478f63e Merge branch 'master' into authenticationdb-efcore
# Conflicts:
#	Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
#	MediaBrowser.Controller/Library/IUserManager.cs
#	MediaBrowser.Controller/Security/IAuthenticationRepository.cs
#	MediaBrowser.Controller/Session/ISessionManager.cs
2021-08-13 21:08:24 -04:00
..
2020-09-06 09:07:27 -06:00
2020-12-22 15:33:25 +00: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