Merge branch 'master' of git://github.com/kayone/NzbDrone

Conflicts:
	NzbDrone.Core/Providers/Jobs/EpisodeSearchJob.cs
	NzbDrone.Core/Providers/SeriesProvider.cs
This commit is contained in:
Mark McDowall 2011-06-13 19:23:43 -07:00
commit a290a0dcb0
50 changed files with 6762 additions and 76 deletions

View file

@ -86,7 +86,6 @@ namespace NzbDrone.Core
_kernel.Bind<ExternalNotificationProvider>().ToSelf().InSingletonScope();
_kernel.Bind<XbmcProvider>().ToSelf().InSingletonScope();
_kernel.Bind<ConfigProvider>().To<ConfigProvider>().InSingletonScope();
_kernel.Bind<SyncProvider>().ToSelf().InSingletonScope();
_kernel.Bind<NotificationProvider>().ToSelf().InSingletonScope();
_kernel.Bind<LogProvider>().ToSelf().InSingletonScope();
_kernel.Bind<MediaFileProvider>().ToSelf().InSingletonScope();