diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-02-05 23:51:29 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-02-05 23:51:29 -0500 |
| commit | e72f59f8cdcc5f44c57b003d085a1077eb08669c (patch) | |
| tree | 444ce228fc02fe5afaf1eead531f4f30cd6dd252 /MediaBrowser.Model/Configuration | |
| parent | 3925a7ca5f780dc6dc013f2cc648817170dbc660 (diff) | |
| parent | 00d24d6676d3ad47a0c2a0f5da2f58c5b4934203 (diff) | |
Merge branch 'dev' into beta
Diffstat (limited to 'MediaBrowser.Model/Configuration')
| -rw-r--r-- | MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/Configuration/ServerConfiguration.cs | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs b/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs index dd6c77e66..c4b96ea2e 100644 --- a/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs +++ b/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs @@ -16,14 +16,12 @@ namespace MediaBrowser.Model.Configuration public bool EnableIntrosFromUpcomingStreamingMovies { get; set; } public int TrailerLimit { get; set; } - public string[] Tags { get; set; } public CinemaModeConfiguration() { EnableIntrosParentalControl = true; EnableIntrosFromSimilarMovies = true; TrailerLimit = 2; - Tags = new[] { "thx" }; } } } diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index 0b472ec22..3cb543e5d 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -161,8 +161,6 @@ namespace MediaBrowser.Model.Configuration /// </summary> /// <value>The dashboard source path.</value> public string DashboardSourcePath { get; set; } - - public bool MergeMetadataAndImagesByName { get; set; } /// <summary> /// Gets or sets the image saving convention. |