Patrick Barron e5380c653b Merge branch 'master' into ef-cleanup ... # Conflicts: # Jellyfin.Data/Entities/Libraries/MediaFileStream.cs # Jellyfin.Data/Jellyfin.Data.csproj		2021-03-14 10:19:35 -04:00
..
Configuration	Move CorsPolicyProvider to Jellyfin.Server.Configuration	2020-09-05 13:02:53 -06:00
Extensions	FxCop -> Net Analyzers (part 2)	2021-03-13 22:33:28 +01:00
Filters	Add websocket session message type to generated openapi.json	2021-03-10 16:33:46 -07:00
Formatters	FxCop -> Net Analyzers (part 2)	2021-03-13 22:33:28 +01:00
Middleware	Use a more descriptive middleware name	2020-12-11 07:17:06 -07:00
Migrations	Merge branch 'master' into ef-cleanup	2021-03-14 10:19:35 -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	Merge remote-tracking branch 'upstream/master' into FixFor5280Part2	2021-02-28 10:12:14 +00:00
Jellyfin.Server.csproj	FxCop -> Net Analyzers (part 2)	2021-03-13 22:33:28 +01:00
Program.cs	FxCop -> Net Analyzers (part 2)	2021-03-13 22:33:28 +01:00
Startup.cs	Simplified Code	2021-01-19 10:36:37 +00:00
StartupOptions.cs	fix	2021-02-27 23:32:22 +00:00