Mark McDowall 67299f0d97 Merge branch 'master' of git://github.com/kayone/NzbDrone ... Conflicts: NzbDrone.Core.Test/NzbDrone.Core.Test.csproj		2011-07-09 19:48:02 -07:00
..
Content	Merge branch 'master' of git://github.com/kayone/NzbDrone	2011-07-09 19:48:02 -07:00
Controllers	Merge branch 'master' of git://github.com/kayone/NzbDrone	2011-07-09 19:48:02 -07:00
Helpers
Models	XbmcProvider updated to include new Json API methods.	2011-07-09 11:19:33 -07:00
Properties	Added version to page footer, minor tweaks.	2011-07-04 23:46:03 -07:00
Scripts	more notification tweaks	2011-07-02 15:19:23 -07:00
Views	Merge branch 'master' of git://github.com/kayone/NzbDrone	2011-07-09 19:48:02 -07:00
favicon.ico
Global.asax
Global.asax.cs	IISExpress now runs in above normal priority	2011-07-03 17:19:05 -07:00
log.config
NzbDrone.Web.csproj	Updated miniprofiler to 1.4	2011-07-07 22:40:29 -07:00
packages.config	Updated miniprofiler to 1.4	2011-07-07 22:40:29 -07:00
Web.config
Web.Debug.config
Web.Release.config