cvium c658a883a2 Merge branch 'master' into keyframe_extraction_v1 ... # Conflicts: # Jellyfin.Api/Controllers/DynamicHlsController.cs # MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs # MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs		2022-01-07 10:23:22 +01:00
..
Configuration	Target net6.0	2021-09-24 20:15:46 +02:00
Extensions	Add nullable dictionary openapi mapping	2021-11-13 07:29:58 -07:00
Filters	Update StyleCop	2021-12-24 18:28:27 +01:00
Formatters	Move non-jellyfin extensions to separate project	2021-06-19 18:04:46 +02:00
Infrastructure	Fix warning: Using directive is not required by the code and can be safely removed (#2149)	2021-10-03 10:49:41 +07:00
Middleware	Update StyleCop	2021-12-24 18:28:27 +01:00
Migrations	Remove more warnings	2021-12-27 07:38:06 -07:00
Properties	Split integration tests from unit tests	2021-03-09 14:17:59 +01:00
Resources/Configuration
wwwroot/api-docs	replace swagger logo	2020-09-03 21:39:50 -06:00
CoreAppHost.cs	Streamline startup code	2021-11-02 16:02:52 +01:00
Jellyfin.Server.csproj	Merge branch 'master' into keyframe_extraction_v1	2022-01-07 10:23:22 +01:00
Program.cs	Migrate network configuration safely	2021-11-24 13:00:12 +01:00
Startup.cs	Add first draft of keyframe extraction for Matroska	2021-09-23 15:29:12 +02:00
StartupOptions.cs	Remove unused using directives	2021-04-17 11:37:55 +01:00