mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-04-21 01:24:44 +01:00
Fixed merge.
This commit is contained in:
@@ -9,11 +9,19 @@ using MediaBrowser.Model.Updates;
|
||||
|
||||
namespace MediaBrowser.Model.Configuration
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// Defines the <see cref="PathSubstitution" />.
|
||||
/// </summary>
|
||||
public class PathSubstitution
|
||||
{
|
||||
/// <summary>
|
||||
/// Gets or sets the value to substitute.
|
||||
/// </summary>
|
||||
public string From { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the value to substitution with.
|
||||
/// </summary>
|
||||
public string To { get; set; } = string.Empty;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,8 +13,16 @@ namespace MediaBrowser.Model.Configuration
|
||||
/// </summary>
|
||||
public class ServerConfiguration : BaseApplicationConfiguration
|
||||
{
|
||||
/// <summary>
|
||||
/// The default value for <see cref="HttpServerPortNumber"/>.
|
||||
/// </summary>
|
||||
public const int DefaultHttpPort = 8096;
|
||||
|
||||
/// <summary>
|
||||
/// The default value for <see cref="PublicHttpsPort"/> and <see cref="HttpsPortNumber"/>.
|
||||
/// </summary>
|
||||
public const int DefaultHttpsPort = 8920;
|
||||
|
||||
private string _baseUrl = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
|
||||
Reference in New Issue
Block a user