Mark Monteiro 679f97d5e9 Merge remote-tracking branch 'upstream/master' into simplify-https-config ... Also reverts conflicting changes made in https://github.com/jellyfin/jellyfin/pull/2798		2020-04-26 17:37:30 -04:00
..
Extensions	Document JSON options change	2020-04-15 17:02:43 -06:00
Migrations	Remove unused usings	2020-03-24 16:12:06 +01: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	Add <ProjectGuid> properties to all project files	2020-04-21 16:21:09 -04:00
Program.cs	Merge remote-tracking branch 'upstream/master' into simplify-https-config	2020-04-26 17:37:30 -04:00
Startup.cs	Fix warnings	2020-01-31 22:26:53 +01:00
StartupOptions.cs	Add '--plugin-manifest-url' command line option and 'InstallationManager:PluginManifestUrl' config option	2020-04-05 13:46:36 -04:00