mirror of
https://github.com/Prowlarr/Prowlarr.git
synced 2026-04-26 23:06:43 -04:00
50b2aba5f9
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