Merge remote-tracking branch 'origin/master' into pneumatic

This commit is contained in:
Mark McDowall 2012-08-29 20:20:06 -07:00
commit a46f1290ee
2 changed files with 4 additions and 4 deletions

View file

@ -13,11 +13,11 @@ namespace NzbDrone.Web.Models
public bool EnableBacklogSearching { get; set; }
[DisplayName("Automatically Ignore Deleted Episodes")]
[Description("Should NzbDrone automatically ignore episodes that were deleted from disk?")]
[Description("Deleted episodes are automatically ignored.")]
public bool AutoIgnorePreviouslyDownloadedEpisodes { get; set; }
[DisplayName("Allowed Release Groups")]
[Description("Comma separated list of release groups to download episodes")]
[DisplayName("Specified Release Groups")]
[Description("Comma separated list of release groups to download episodes (leave empty for all groups)")]
public string AllowedReleaseGroups { get; set; }
}
}