Merge branch 'master' into backbone

Browse Source

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

...

This commit is contained in:

Mark McDowall

2012-11-23 08:26:26 -08:00

parent b4a1942416 9538559f61

commit ccccb9a4cd

36 changed files with 431 additions and 220 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

Libraries/TvdbLib.dll

Binary file not shown.