sonarr-repo-only/NzbDrone.Core/MetadataSource
Keivan Beigi 50b2aba5f9 Merge branch 'develop'
Conflicts:
	NzbDrone.Core.Test/MetadataSourceTests/TraktProxyFixture.cs
	NzbDrone.Core/Jobs/TaskManager.cs
	NzbDrone.Core/MetadataSource/TraktProxy.cs
	NzbDrone.Core/Tv/SeasonService.cs
	NzbDrone.Integration.Test/SeasonIntegrationTests.cs
2013-09-16 10:24:10 -07:00
..
Trakt Merge branch 'develop' 2013-09-16 10:24:10 -07:00
IProvideSeriesInfo.cs cleaned up refresh series info 2013-06-02 12:29:00 -07:00
ISearchForNewSeries.cs fully replaced TVDB with Trakt.tv 2013-03-31 13:25:39 -07:00
TraktProxy.cs Merge branch 'develop' 2013-09-16 10:24:10 -07:00