michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev

Browse Source
This commit is contained in:
Luke Pulverenti 2016-06-29 15:25:48 -04:00
commit 5b0b6e1d3f
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
View File

@ -35,7 +35,7 @@
<UseRefCounting>false</UseRefCounting>
<Profiling>false</Profiling>
<HttpClientHandler>HttpClientHandler</HttpClientHandler>
<TlsProvider>Default</TlsProvider>
<TlsProvider>Legacy</TlsProvider>
<LinkMode>None</LinkMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@ -6012,9 +6012,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\nowplayingbar.css">
<Link>Resources\dashboard-ui\css\nowplayingbar.css</Link>
</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">
<Link>Resources\dashboard-ui\css\site.css</Link>
</BundleResource>
@ -6663,12 +6660,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\scheduledtaskspage.js">
<Link>Resources\dashboard-ui\scripts\scheduledtaskspage.js</Link>
</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">
<Link>Resources\dashboard-ui\scripts\searchpage.js</Link>
</BundleResource>