You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Mark McDowall
f3809d3a80
Merge branch 'master' into backbone
Conflicts:
NzbDrone.Common/packages.config
NzbDrone.Core.Test/packages.config
NzbDrone.Core/NzbDrone.Core.csproj
NzbDrone.Core/packages.config
NzbDrone.Services/NzbDrone.Services.Service/packages.config
NzbDrone.Web.UI.Test/NzbDrone.Web.UI.Automation.csproj
NzbDrone.Web/_bin_deployableAssemblies/amd64/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest
NzbDrone.Web/_bin_deployableAssemblies/amd64/Microsoft.VC90.CRT/README_ENU.txt
NzbDrone.Web/_bin_deployableAssemblies/amd64/Microsoft.VC90.CRT/msvcr90.dll
NzbDrone.Web/_bin_deployableAssemblies/amd64/sqlceme40.dll
NzbDrone.Web/_bin_deployableAssemblies/x86/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest
NzbDrone.Web/_bin_deployableAssemblies/x86/Microsoft.VC90.CRT/README_ENU.txt
NzbDrone.Web/_bin_deployableAssemblies/x86/Microsoft.VC90.CRT/msvcr90.dll
NzbDrone.Web/_bin_deployableAssemblies/x86/sqlceme40.dll
NzbDrone.Web/packages.config
|
12 years ago |
| .. |
|
Microsoft.VC90.CRT.manifest
|
Merge branch 'master' into backbone
|
12 years ago |
|
README_ENU.txt
|
…
|
|
|
msvcr90.dll
|
…
|
|
