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

Browse source

Conflicts:
	NzbDrone.Core.Test/SeriesProviderTest.cs
	NzbDrone.Core/Providers/EpisodeProvider.cs

...

This commit is contained in:

Mark McDowall 2011-04-22 15:24:05 -07:00

parent 361d1f8d3b 680ea45839

commit 5a8baa9d6c

2 changed files with 293 additions and 0 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/SeriesProviderTest.cs Normal file

View file

Binary file not shown.