mirror of
https://github.com/Sonarr/Sonarr
synced 2025-02-27 00:13:33 +00:00
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 |
||
---|---|---|
.. | ||
TraktProxyFixture.cs |