You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		11 years ago
..
Client	…
Properties	…
CommandIntegerationTests.cs	…
EpisodeIntegrationTests.cs	Merge branch 'develop'	11 years ago
HistoryIntegrationTest.cs	…
IndexerIntegrationFixture.cs	…
IntegrationTest.cs	…
IntegrationTestDirectoryInfo.cs	…
NamingConfigTests.cs	…
NzbDrone.Integration.Test.csproj	…
NzbDroneRunner.cs	…
QualityProfileIntegrationTest.cs	…
ReleaseIntegrationTest.cs	…
RootFolderIntegrationTest.cs	…
SeriesIntegrationTest.cs	…
packages.config	…