Merge remote-tracking branch 'upstream/master' into support-running-without-web-content

This commit is contained in:
Mark Monteiro
2020-03-11 23:04:47 +01:00
163 changed files with 2133 additions and 1562 deletions

View File

@@ -17,7 +17,6 @@ namespace Emby.Server.Implementations
{
{ NoWebContentKey, bool.FalseString },
{ HttpListenerHost.DefaultRedirectKey, "web/index.html" },
{ MusicBrainzAlbumProvider.BaseUrlKey, "https://www.musicbrainz.org" },
{ FfmpegProbeSizeKey, "1G" },
{ FfmpegAnalyzeDurationKey, "200M" }
};