aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Wilber <Spacetech326@gmail.com>2020-11-08 11:55:38 -0800
committerGary Wilber <Spacetech326@gmail.com>2020-11-08 11:55:38 -0800
commitf680a0fbbed346a5a5e98b2066604c463791190c (patch)
treeba50bd55019d48b0ba688660e37c3da0ccff6b89
parente6d8c02944ddd83e1219d536abbd372cde432035 (diff)
fix merge
-rw-r--r--MediaBrowser.Model/Configuration/ServerConfiguration.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 4d24e45b0..be313bde1 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -271,6 +271,7 @@ namespace MediaBrowser.Model.Configuration
/// </summary>
public string[] KnownProxies { get; set; }
+ /// <summary>
/// Gets or sets the number of days we should retain activity logs.
/// </summary>
public int? ActivityLogRetentionDays { get; set; }