aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model/Configuration/ServerConfiguration.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-01-27 01:31:31 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-01-27 01:33:59 -0500
commit106a2f3e1a0bfee9e056ef22b94599c7b2a47530 (patch)
treef766b9a6f0a161cd21c432ba53bc3f2a3deb3b22 /MediaBrowser.Model/Configuration/ServerConfiguration.cs
parent51cd5e90b0a926ea728f9b98e5b9f380948b5cce (diff)
add back MergeMetadataAndImagesByName
Conflicts: MediaBrowser.Model/Configuration/ServerConfiguration.cs
Diffstat (limited to 'MediaBrowser.Model/Configuration/ServerConfiguration.cs')
-rw-r--r--MediaBrowser.Model/Configuration/ServerConfiguration.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 77bce5cbd..91e20c3e0 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -180,6 +180,8 @@ namespace MediaBrowser.Model.Configuration
/// <value>The dashboard source path.</value>
public string DashboardSourcePath { get; set; }
+ public bool MergeMetadataAndImagesByName { get; set; }
+
/// <summary>
/// Gets or sets the image saving convention.
/// </summary>