Merge branch 'master' of git://github.com/kayone/NzbDrone

Conflicts:
	NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
This commit is contained in:
Mark McDowall
2011-07-09 19:48:02 -07:00
80 changed files with 3341 additions and 1496 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
@using NzbDrone.Web.Models;
@model IEnumerable<NzbDrone.Core.Repository.Series>
@section TitleContent{
Series
NZBDrone
}
<style>
/* progress bar container */