Merge branch 'markus101'

Browse source

Conflicts:
	NzbDrone.Core.Test/SeriesProviderTest.cs
	NzbDrone.Core/Providers/MediaFileProvider.cs
	NzbDrone.Core/Providers/SeriesProvider.cs

...

This commit is contained in:

kay.one 2011-06-16 19:48:24 -07:00

parent 190ce6b142 93340f7d53

commit 3cccb5858a

21 changed files with 524 additions and 280 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

View file

Binary file not shown.