Patrick Barron be88efce3c Merge branch 'master' into authenticationdb-efcore ... # Conflicts: # Emby.Server.Implementations/Devices/DeviceManager.cs # Emby.Server.Implementations/HttpServer/Security/SessionContext.cs # Emby.Server.Implementations/Security/AuthenticationRepository.cs # Emby.Server.Implementations/Session/SessionManager.cs # Jellyfin.Server.Implementations/Security/AuthorizationContext.cs # MediaBrowser.Controller/Library/IUserManager.cs # MediaBrowser.Controller/Net/ISessionContext.cs		2021-06-18 18:56:10 -04:00
..
Configuration	Move CorsPolicyProvider to Jellyfin.Server.Configuration	2020-09-05 13:02:53 -06:00
Extensions	Merge remote-tracking branch 'upstream/master' into UrlDecoding	2021-05-08 12:22:09 +01:00
Filters	Remove unused using directives	2021-04-17 11:37:55 +01:00
Formatters	Remove unused using directives	2021-04-17 11:37:55 +01:00
Middleware	Fix duplicate keys causing an exception	2021-06-09 09:59:30 +02:00
Migrations	Merge branch 'master' into authenticationdb-efcore	2021-06-18 18:56:10 -04:00
Properties	Split integration tests from unit tests	2021-03-09 14:17:59 +01:00
Resources/Configuration	Increase min log level to 'Warning' framework namespaces	2020-03-03 00:36:54 +01:00
wwwroot/api-docs	replace swagger logo	2020-09-03 21:39:50 -06:00
CoreAppHost.cs	Fix concurrency issues	2021-06-18 17:06:38 -04:00
Jellyfin.Server.csproj	Update to dotnet 5.0.7	2021-06-14 06:44:55 -06:00
Program.cs	Address review comments	2021-05-24 10:48:01 +02:00
Startup.cs	Merge remote-tracking branch 'upstream/master' into UrlDecoding	2021-05-08 12:22:09 +01:00
StartupOptions.cs	Remove unused using directives	2021-04-17 11:37:55 +01:00