Merge branch 'master' into backbone

Browse Source

Conflicts:
	NzbDrone.Web/Views/Settings/Quality.cshtml

...

This commit is contained in:

Mark McDowall committed 2012-11-23 08:26:26 -08:00

2 parents b4a1942416 9538559f61

commit ccccb9a4cd

36 files changed

+431 -220

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

No files matched your search

Libraries/TvdbLib.dll

BIN

Binary file not shown.