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

Browse source

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

...

This commit is contained in:

Mark McDowall 2011-06-15 23:49:30 -07:00

parent 93340f7d53 cb8cb1691f

commit 0432109a95

45 changed files with 29397 additions and 183 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.