Merge branch 'markus101'

Conflicts:
	NzbDrone.Web/NzbDrone.Web.csproj
	NzbDrone.Web/Views/Log/Index.cshtml
This commit is contained in:
kay.one
2011-04-21 21:03:59 -07:00
32 changed files with 1359 additions and 537 deletions
+2 -2
View File
@@ -24,9 +24,9 @@ namespace NzbDrone.Core.Repository
public string Language { get; set; }
public EpisodeStatusType Status { get; set; }
public DayOfWeek? LastInfoSync { get; set; }
public DateTime? LastInfoSync { get; set; }
public DayOfWeek? LastDiskSync { get; set; }
public DateTime? LastDiskSync { get; set; }
[SubSonicToOneRelation(ThisClassContainsJoinKey = true)]
public virtual Season Season { get; set; }