Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
This commit is contained in:
commit
5b0b6e1d3f
|
@ -35,7 +35,7 @@
|
||||||
<UseRefCounting>false</UseRefCounting>
|
<UseRefCounting>false</UseRefCounting>
|
||||||
<Profiling>false</Profiling>
|
<Profiling>false</Profiling>
|
||||||
<HttpClientHandler>HttpClientHandler</HttpClientHandler>
|
<HttpClientHandler>HttpClientHandler</HttpClientHandler>
|
||||||
<TlsProvider>Default</TlsProvider>
|
<TlsProvider>Legacy</TlsProvider>
|
||||||
<LinkMode>None</LinkMode>
|
<LinkMode>None</LinkMode>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
|
@ -6012,9 +6012,6 @@
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\nowplayingbar.css">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\nowplayingbar.css">
|
||||||
<Link>Resources\dashboard-ui\css\nowplayingbar.css</Link>
|
<Link>Resources\dashboard-ui\css\nowplayingbar.css</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\search.css">
|
|
||||||
<Link>Resources\dashboard-ui\css\search.css</Link>
|
|
||||||
</BundleResource>
|
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\site.css">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\site.css">
|
||||||
<Link>Resources\dashboard-ui\css\site.css</Link>
|
<Link>Resources\dashboard-ui\css\site.css</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
@ -6663,12 +6660,6 @@
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\scheduledtaskspage.js">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\scheduledtaskspage.js">
|
||||||
<Link>Resources\dashboard-ui\scripts\scheduledtaskspage.js</Link>
|
<Link>Resources\dashboard-ui\scripts\scheduledtaskspage.js</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\search.js">
|
|
||||||
<Link>Resources\dashboard-ui\scripts\search.js</Link>
|
|
||||||
</BundleResource>
|
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\searchmenu.js">
|
|
||||||
<Link>Resources\dashboard-ui\scripts\searchmenu.js</Link>
|
|
||||||
</BundleResource>
|
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\searchpage.js">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\searchpage.js">
|
||||||
<Link>Resources\dashboard-ui\scripts\searchpage.js</Link>
|
<Link>Resources\dashboard-ui\scripts\searchpage.js</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user