Conflicts:
	MediaBrowser.Server.Startup.Common/ApplicationHost.cs
pull/702/head
Luke Pulverenti 10 years ago
commit 7903037524

@ -194,6 +194,7 @@
"LabelVideoCodec": "Video: {0}",
"LabelRemoteAccessUrl": "Remote access: {0}",
"LabelRunningOnPort": "Running on port {0}.",
"LabelRunningOnHttpsPort": "Running on SSL port {0}.",
"HeaderLatestFromChannel": "Latest from {0}",
"ButtonDownload": "Download",
"LabelUnknownLanaguage": "Unknown language",

@ -977,6 +977,7 @@ namespace MediaBrowser.Server.Startup.Common
CachePath = ApplicationPaths.CachePath,
MacAddress = GetMacAddress(),
HttpServerPortNumber = HttpServerPort,
HttpsPortNumber = HttpsServerPort,
OperatingSystem = OperatingSystemDisplayName,
CanSelfRestart = CanSelfRestart,
CanSelfUpdate = CanSelfUpdate,

Loading…
Cancel
Save