Sonarr/NzbDrone.Web
Mark McDowall f31b1368f9 Merge branch 'master' into backbone
Conflicts:
	NzbDrone.Web/_bin_deployableAssemblies/amd64/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest
2012-12-26 22:14:46 -08:00
..
App_Start Fixed post build steps 2012-12-24 19:46:52 -08:00
Content Merge branch 'master' into backbone 2012-12-24 21:53:45 -08:00
Controllers Free space widgets 2012-12-23 23:16:43 -08:00
Fakes Upgraded nuget packages, Ninject 3, SignalR 5 2012-11-03 11:23:47 -07:00
FakesAssemblies Adding works! 2012-12-10 20:39:35 -08:00
Filters
Helpers Binders full of women are no longer ignored 2012-11-13 17:14:27 -08:00
Models Added nzbx to UI 2012-12-22 11:44:47 -08:00
Properties Fixed up tests 2012-09-10 23:35:25 -07:00
Scripts Existing series loading again 2012-12-26 21:31:55 -08:00
Views Merge branch 'master' into backbone 2012-12-24 21:53:45 -08:00
_bin_deployableAssemblies/x86 Merge branch 'master' into backbone 2012-12-26 22:14:46 -08:00
Global.asax
Global.asax.cs Fixed SignalR - Its FM! 2012-12-18 17:40:47 -08:00
NzbDrone.Web.csproj Merge branch 'master' into backbone 2012-12-24 21:53:45 -08:00
NzbDrone.Web.ncrunchproject
Web.Debug.config
Web.Release.config
Web.config Merge branch 'master' into backbone 2012-12-24 21:53:45 -08:00
favicon.ico
log.config
packages.config Merge branch 'master' into backbone 2012-12-24 21:53:45 -08:00