diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-11-24 11:31:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-24 11:31:05 -0500 |
| commit | 8ad6f3df9129403465a0564d758819eb30f25895 (patch) | |
| tree | 1863c384aa934500a44255e9538e29cd1c04b6b7 /MediaBrowser.Model | |
| parent | 682b02210f42c92e44702f5c9c204bc80c946df5 (diff) | |
| parent | 9606a2a710614404b4dda96cceff688314a1ec89 (diff) | |
Merge pull request #2307 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Configuration/ServerConfiguration.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/Querying/ItemFields.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index cdda858b72..64225ae76c 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -154,7 +154,6 @@ namespace MediaBrowser.Model.Configuration /// </summary> /// <value><c>true</c> if [enable dashboard response caching]; otherwise, <c>false</c>.</value> public bool EnableDashboardResponseCaching { get; set; } - public bool EnableDashboardResourceMinification { get; set; } /// <summary> /// Allows the dashboard to be served from a custom path. @@ -230,7 +229,6 @@ namespace MediaBrowser.Model.Configuration HttpsPortNumber = DefaultHttpsPort; EnableHttps = false; EnableDashboardResponseCaching = true; - EnableDashboardResourceMinification = true; EnableAnonymousUsageReporting = true; EnableAutomaticRestart = true; diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs index dfca9e7718..bf1d4991cf 100644 --- a/MediaBrowser.Model/Querying/ItemFields.cs +++ b/MediaBrowser.Model/Querying/ItemFields.cs @@ -45,6 +45,8 @@ /// </summary> Chapters, + ChildCount, + /// <summary> /// The critic rating summary /// </summary> |