Merge remote-tracking branch 'upstream/master' into NetworkPR2

This commit is contained in:
Greenback
2020-10-09 14:12:41 +01:00
157 changed files with 3014 additions and 6328 deletions

View File

@@ -25,8 +25,6 @@ namespace MediaBrowser.Model.Configuration
public bool EnableInternetProviders { get; set; }
public bool ImportMissingEpisodes { get; set; }
public bool EnableAutomaticSeriesGrouping { get; set; }
public bool EnableEmbeddedTitles { get; set; }