Merge branch 'season-ignore'

Conflicts:
	NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
	NzbDrone.Core/NzbDrone.Core.csproj
This commit is contained in:
Mark McDowall 2012-02-21 23:45:46 -08:00
commit 6116fdb032
16 changed files with 471 additions and 232 deletions

View file

@ -9,5 +9,6 @@ namespace NzbDrone.Web.Models
public List<EpisodeModel> Episodes { get; set; }
public bool AnyWanted { get; set; }
public string CommonStatus { get; set; }
public bool Ignored { get; set; }
}
}