tedkulp/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2026-04-27 23:06:29 -04:00
Code Issues Projects Releases Wiki Activity
Files
50b2aba5f934585f9caf4cb024d2f793755f2927
Sonarr/NzbDrone.Core.Test/MetadataSourceTests
T
History
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