Merge branch 'kay.one' of github.com:NzbDrone/NzbDrone into markus

Conflicts: NzbDrone.Core.Test/ParserTest.cs
2026-04-18 21:34:28 -04:00 · 2011-10-24 23:22:34 -07:00
parent 1134d925f4 c1116d0faa
commit 6b26843b50
2 changed files with 4 additions and 4 deletions
@@ -377,4 +377,4 @@ namespace NzbDrone.Core.Test
            result.Should().BeNull();
        }
    }
-}
+}