Merge remote-tracking branch 'origin/master' into dynamic-jobs

Conflicts:
	NzbDrone.Web/Scripts/NzbDrone/series.js
This commit is contained in:
Mark McDowall 2012-09-22 22:37:51 -07:00
commit b21bf01bf0
40 changed files with 700 additions and 262 deletions

View file

@ -17,6 +17,7 @@ namespace NzbDrone.Core.Model
DownloadClientFailure = 10,
Skipped = 11,
Failure = 12,
ReleaseGroupNotWanted = 13
ReleaseGroupNotWanted = 13,
AiredAfterCustomStartDate = 14
}
}