add back MergeMetadataAndImagesByName

Conflicts: MediaBrowser.Model/Configuration/ServerConfiguration.cs
2016-01-27 01:31:31 -05:00
parent 51cd5e90b0
commit 106a2f3e1a
3 changed files with 18 additions and 0 deletions
@@ -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>