Merge branch 'master' of git://github.com/kayone/NzbDrone

Browse Source

Conflicts:
	NzbDrone.Core.Test/EpisodeProviderTest.cs
	NzbDrone.Core/NzbDrone.Core.csproj

...

This commit is contained in:

Mark McDowall

2011-04-25 11:24:11 -07:00

parent deb7f9d811 a8815cd5ea

commit 742ad0a932

5 changed files with 13 additions and 1146 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

NzbDrone.Core.Test/EpisodeProviderTest.cs Normal file

Binary file not shown.