From db66b73a4f500230dd0ed4f5b93d02c6c6916973 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 23 Apr 2015 22:15:29 -0400
Subject: updated ImageMagickSharp

---
 MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs | 6 ++++++
 MediaBrowser.Model/Configuration/ServerConfiguration.cs          | 2 --
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'MediaBrowser.Model/Configuration')

diff --git a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
index 19620890e7..ca9db0bf08 100644
--- a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
@@ -50,6 +50,12 @@ namespace MediaBrowser.Model.Configuration
         /// <value>The cache path.</value>
         public string CachePath { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether [enable custom path sub folders].
+        /// </summary>
+        /// <value><c>true</c> if [enable custom path sub folders]; otherwise, <c>false</c>.</value>
+        public bool EnableCustomPathSubFolders { get; set; }
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="BaseApplicationConfiguration" /> class.
         /// </summary>
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index ac9bd6b08f..8a3a2a3e43 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -185,8 +185,6 @@ namespace MediaBrowser.Model.Configuration
 
         public MetadataOptions[] MetadataOptions { get; set; }
 
-        public string TranscodingTempPath { get; set; }
-
         public bool EnableAutomaticRestart { get; set; }
 
         public bool EnableRealtimeMonitor { get; set; }
-- 
cgit v1.2.3