starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-16 14:03:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev

Browse Source 
Conflicts:
	MediaBrowser.Server.Startup.Common/ApplicationHost.cs
This commit is contained in:
Luke Pulverenti
2015-01-17 15:17:01 -05:00
parent d26707708d 1d331dab12
commit 7903037524
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
MediaBrowser.Server.Startup.Common/ApplicationHost.cs
View File

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