Merge branch 'markus101'

Browse source

Conflicts:
	NzbDrone.Core.Test/SeriesProviderTest.cs

...

This commit is contained in:

kay.one 2011-06-18 01:36:05 -07:00

parent 5629d68645 d6920ee8ea

commit d55e2606ad

9 changed files with 29 additions and 21 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.