lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1090 from MediaBrowser/master

Browse Source 
merge
This commit is contained in:
Luke 2015-04-28 11:03:57 -04:00
commit 88191e01da
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -538,6 +538,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\nowplaying.html"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\nowplaying.html">
<Link>Resources\dashboard-ui\nowplaying.html</Link> <Link>Resources\dashboard-ui\nowplaying.html</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\photos.html">
<Link>Resources\dashboard-ui\photos.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\playbackconfiguration.html"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\playbackconfiguration.html">
<Link>Resources\dashboard-ui\playbackconfiguration.html</Link> <Link>Resources\dashboard-ui\playbackconfiguration.html</Link>
</BundleResource> </BundleResource>
@ -1444,6 +1447,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\nowplayingpage.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\nowplayingpage.js">
<Link>Resources\dashboard-ui\scripts\nowplayingpage.js</Link> <Link>Resources\dashboard-ui\scripts\nowplayingpage.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\photos.js">
<Link>Resources\dashboard-ui\scripts\photos.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\playbackconfiguration.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\playbackconfiguration.js">
<Link>Resources\dashboard-ui\scripts\playbackconfiguration.js</Link> <Link>Resources\dashboard-ui\scripts\playbackconfiguration.js</Link>
</BundleResource> </BundleResource>