1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr synced 2025-02-27 00:13:33 +00:00
Sonarr/NzbDrone.Core.Test/MetadataSourceTests
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
..
TraktProxyFixture.cs Merge branch 'develop' 2013-09-16 10:24:10 -07:00