Mark Monteiro a10aec6956 Fix merge		2020-05-10 18:17:12 -04:00
..
Extensions	Document JSON options change	2020-04-15 17:02:43 -06:00
Migrations	Address reviews	2020-04-27 08:42:46 -04:00
Properties	Merge remote-tracking branch 'upstream/master' into development-https	2020-04-01 23:21:30 +02:00
Resources/Configuration	Increase min log level to 'Warning' framework namespaces	2020-03-03 00:36:54 +01:00
CoreAppHost.cs	Add back warning message when Skia encoder cannot be used	2020-04-17 10:25:49 -04:00
Jellyfin.Server.csproj	Added option to disable metrics collection and defaulted it to off	2020-04-26 11:28:17 -04:00
Program.cs	Fix merge	2020-05-10 18:17:12 -04:00
Startup.cs	Address reviews	2020-04-27 08:42:46 -04:00
StartupOptions.cs	Add '--plugin-manifest-url' command line option and 'InstallationManager:PluginManifestUrl' config option	2020-04-05 13:46:36 -04:00