Patrick Barron 9fa4fff15d Merge branch 'master' into event-rewrite-1 ... # Conflicts: # Emby.Dlna/Emby.Dlna.csproj # Emby.Dlna/Eventing/DlnaEventManager.cs # Emby.Dlna/Service/BaseService.cs # Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs # MediaBrowser.Controller/Subtitles/SubtitleDownloadEventArgs.cs		2020-08-24 20:04:13 -04:00
..
Extensions	Ignore null json values	2020-08-23 07:48:12 -06:00
Formatters	Use proper mediatypename	2020-08-16 11:48:54 -06:00
Middleware	Add X-Response-Time-ms header and log slow server response time	2020-07-14 13:40:18 +02:00
Migrations	Switch to unstable chromecast version.	2020-08-01 14:56:32 -04:00
Models	Merge remote-tracking branch 'upstream/api-migration' into api-cors	2020-06-06 17:07:29 -06:00
Properties
Resources/Configuration
CoreAppHost.cs	Allow plugins to register services.	2020-08-16 17:25:14 -04:00
Jellyfin.Server.csproj	Bump Serilog.AspNetCore from 3.2.0 to 3.4.0	2020-08-03 12:04:18 +00:00
Program.cs	Allow plugins to register services.	2020-08-16 17:25:14 -04:00
Startup.cs	add proper converter for legacy datetime	2020-08-10 11:58:06 -06:00
StartupOptions.cs	Respect FFMpeg path passed via Environment Variable	2020-06-29 17:17:28 +01:00