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.

Mark McDowall ca3b4cb1d7 Merge branch 'api-key' into develop ... Conflicts: NzbDrone.Integration.Test/NzbDroneRunner.cs		11 years ago
..
Client	…
Properties	…
CommandIntegerationTests.cs	…
EpisodeIntegrationTests.cs	…
HistoryIntegrationTest.cs	…
IndexerIntegrationFixture.cs	…
IntegrationTest.cs	…
IntegrationTestDirectoryInfo.cs	…
NamingConfigTests.cs	…
NzbDrone.Integration.Test.csproj	…
NzbDroneRunner.cs	Merge branch 'api-key' into develop	11 years ago
QualityProfileIntegrationTest.cs	…
ReleaseIntegrationTest.cs	…
RootFolderIntegrationTest.cs	…
SeriesIntegrationTest.cs	…
packages.config	…