alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-06 22:32:57 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	Nuget/MediaBrowser.ApiClient.nuspec
This commit is contained in:
LukePulverenti
2013-02-25 22:43:56 -05:00
parent 2d06095447 59ce944478
commit efdb2f3990
27 changed files with 735 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.WebDashboard/Html/Readme.txt Normal file
View File

@@ -0,0 +1,4 @@
All static files such as html, images, etc, need to be marked as embedded resources.
Here is a link for more information regarding the Build Action property.
http://msdn.microsoft.com/en-us/library/0c6xyb66.aspx

1
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@@ -384,6 +384,7 @@
<EmbeddedResource Include="Html\scripts\ItemDetailPage.js" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Html\Readme.txt" />
<EmbeddedResource Include="Html\css\images\media\playCircle.png" />
<EmbeddedResource Include="Html\css\images\media\nextTrack.png" />
<EmbeddedResource Include="Html\css\images\media\pause.png" />