lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a couple of merge errors.

Browse Source
This commit is contained in:
Greenback 2020-11-21 14:09:56 +00:00
parent 33f6b13d4f
commit 086e2fdaa1
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MediaBrowser.Model/Configuration/PathSubstitution.cs
View File

@ -1,11 +1,4 @@
#nullable enable
#pragma warning disable CS1591
#pragma warning disable CA1819
using System;
using System.Collections.Generic;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Updates;
namespace MediaBrowser.Model.Configuration
{

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

@ -233,7 +233,7 @@ namespace MediaBrowser.Model.Configuration
/// Gets or sets a value indicating whether quick connect is available for use on this server.
/// </summary>
public bool QuickConnectAvailable { get; set; } = false;
/// <summary>
/// Gets or sets a value indicating whether access outside of the LAN is permitted.
/// </summary>
@ -440,4 +440,4 @@ namespace MediaBrowser.Model.Configuration
/// </summary>
public int? ActivityLogRetentionDays { get; set; } = 30;
}
}
}