kay.one 4253d0b4cb Merge branch 'markus101' ... Conflicts: NzbDrone.Web/Views/Series/Index.cshtml		2011-06-29 23:19:44 -07:00
..
Error.cshtml	RAZOR'd Series and the Error page.	2011-04-21 00:14:47 -07:00
Footer.cshtml	Fixed doctype,	2011-06-27 18:23:22 -07:00
_Layout.cshtml	Merge branch 'markus101'	2011-06-29 23:19:44 -07:00