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
..
ActivityManager.cs	Merge branch 'master' into authenticationdb-efcore	2021-08-13 21:08:24 -04:00