Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj

@@ -449,6 +449,9 @@
     <Content Include="dashboard-ui\thirdparty\video-js-4.0\demo.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\thirdparty\video-js-4.0\font\vjs.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\thirdparty\video-js-4.0\tubesprite.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -1012,6 +1015,15 @@
     <None Include="dashboard-ui\thirdparty\video-js-4.0\demo.captions.vtt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="dashboard-ui\thirdparty\video-js-4.0\font\vjs.eot">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="dashboard-ui\thirdparty\video-js-4.0\font\vjs.ttf">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="dashboard-ui\thirdparty\video-js-4.0\font\vjs.woff">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup />