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

Merge remote-tracking branch 'upstream/master' into simplify-https-config

Browse Source
This commit is contained in:
Mark Monteiro
2020-04-26 11:44:42 -04:00
parent 00a0e013c6 f81833693d
commit 93649ad77b
220 changed files with 3615 additions and 5496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
MediaBrowser.Model/Configuration/ServerConfiguration.cs
View File

@@ -15,9 +15,8 @@ namespace MediaBrowser.Model.Configuration
private string _baseUrl;
/// <summary>
/// Gets or sets a value indicating whether [enable u pn p].
/// Gets or sets a value indicating whether to enable automatic port forwarding.
/// </summary>
/// <value><c>true</c> if [enable u pn p]; otherwise, <c>false</c>.</value>
public bool EnableUPnP { get; set; }
/// <summary>
@@ -281,7 +280,7 @@ namespace MediaBrowser.Model.Configuration
AutoRunWebApp = true;
EnableRemoteAccess = true;
EnableUPnP = true;
EnableUPnP = false;
MinResumePct = 5;
MaxResumePct = 90;