aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-06-29 15:25:48 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-06-29 15:25:48 -0400
commit5b0b6e1d3f8f3e4c2f18a341094ceefee66ef418 (patch)
treea4dfc556c46a3c584846b004572f140c623d1f56
parentc79c0d01bf209aaaebc4b78347a0126bf4625762 (diff)
parenta32d1748d61a45ef56b8bf765bf9cdc484de1d44 (diff)
Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
-rw-r--r--MediaBrowser.Server.Mac/Emby.Server.Mac.csproj11
1 files changed, 1 insertions, 10 deletions
diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
index 54525465d..dcedea5f0 100644
--- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
+++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
@@ -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>