Merge remote-tracking branch 'upstream/master' into warn-259810

This commit is contained in:
Cody Robibero
2021-09-03 06:56:45 -06:00
47 changed files with 1000 additions and 343 deletions

View File

@@ -1100,7 +1100,6 @@ namespace Emby.Server.Implementations
ServerName = FriendlyName,
LocalAddress = GetSmartApiUrl(source),
SupportsLibraryMonitor = true,
EncoderLocation = _mediaEncoder.EncoderLocation,
SystemArchitecture = RuntimeInformation.OSArchitecture,
PackageName = _startupOptions.PackageName
};