mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'markus101'

This commit is contained in:
kay.one 2011-05-20 00:19:19 -07:00
parent 0d02b0538b 00b1e4bb12
commit 5ab104dec6
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NzbDrone.Core.Test/SabProviderTest.cs
View File

@ -53,7 +53,7 @@ namespace NzbDrone.Core.Test
.Setup( .Setup(
s => s =>
s.DownloadString( s.DownloadString(
"http://192.168.5.55:2222/api?mode=addurl&name=http://www.nzbclub.com/nzb_download.aspx?mid=1950232&priority=0&cat=tv&nzbname=This+is+an+Nzb&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass")) "http://192.168.5.55:2222/api?mode=addurl&name=http://www.nzbclub.com/nzb_download.aspx?mid=1950232&priority=0&pp=3&cat=tv&nzbname=This+is+an+Nzb&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass"))
.Returns("ok"); .Returns("ok");
//Act //Act

1
NzbDrone.Web/NzbDrone.Web.csproj
View File

@ -648,6 +648,7 @@
<Content Include="Scripts\2011.1.315\telerik.treeview.min.js" /> <Content Include="Scripts\2011.1.315\telerik.treeview.min.js" />
<Content Include="Scripts\2011.1.315\telerik.upload.min.js" /> <Content Include="Scripts\2011.1.315\telerik.upload.min.js" />
<Content Include="Scripts\2011.1.315\telerik.window.min.js" /> <Content Include="Scripts\2011.1.315\telerik.window.min.js" />
<Content Include="Scripts\gridLoad.js" />
<Content Include="Scripts\jquery-1.5.2-vsdoc.js" /> <Content Include="Scripts\jquery-1.5.2-vsdoc.js" />
<Content Include="Scripts\jquery-1.5.2.js" /> <Content Include="Scripts\jquery-1.5.2.js" />
<Content Include="Scripts\jquery-1.5.2.min.js" /> <Content Include="Scripts\jquery-1.5.2.min.js" />