Merge branch 'markus101'

Conflicts:
	NzbDrone.Web/Views/Series/Index.cshtml
This commit is contained in:
kay.one 2011-06-29 23:19:44 -07:00
commit 4253d0b4cb
15 changed files with 358 additions and 378 deletions

View file

@ -65,7 +65,6 @@
.AddGroup("NzbDrone", group => group
.Add("Notification.js")
.Add("gridLoad.js")
.Add("episodeSearch.js"))
))