Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
This commit is contained in:
commit
bbda91a228
|
@ -517,7 +517,8 @@ namespace MediaBrowser.WebDashboard.Api
|
||||||
"wizardstartpage.js",
|
"wizardstartpage.js",
|
||||||
"wizarduserpage.js",
|
"wizarduserpage.js",
|
||||||
"supporterkeypage.js",
|
"supporterkeypage.js",
|
||||||
"supporterpage.js"
|
"supporterpage.js",
|
||||||
|
"playlist.js"
|
||||||
};
|
};
|
||||||
|
|
||||||
var memoryStream = new MemoryStream();
|
var memoryStream = new MemoryStream();
|
||||||
|
|
|
@ -213,6 +213,9 @@
|
||||||
<Content Include="dashboard-ui\scripts\itembynamedetailpage.js">
|
<Content Include="dashboard-ui\scripts\itembynamedetailpage.js">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
<Content Include="dashboard-ui\scripts\playlist.js">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
<Content Include="dashboard-ui\scripts\librarybrowser.js">
|
<Content Include="dashboard-ui\scripts\librarybrowser.js">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user