kay.one 651a63edea Merge branch 'markus' into kay.one ... Conflicts: NzbDrone.Core.Test/ProviderTests/LogProviderTest.cs		2011-10-20 22:08:55 -07:00
..
App_GlobalResources
Content
Controllers
Helpers
Models
Properties
Scripts
Views
favicon.ico
Global.asax
Global.asax.cs
log.config
NzbDrone.Web.csproj
packages.config
Web.config
Web.Debug.config
Web.Release.config