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

Merge pull request #955 from MediaBrowser/master

Browse Source 
merge from master
This commit is contained in:
Luke 2014-12-14 01:15:00 -05:00
commit e490223ebc
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj
View File

@ -301,9 +301,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\dashboardgeneral.html"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\dashboardgeneral.html">
<Link>Resources\dashboard-ui\dashboardgeneral.html</Link> <Link>Resources\dashboard-ui\dashboardgeneral.html</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\dashboardsync.html">
<Link>Resources\dashboard-ui\dashboardsync.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\device.html"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\device.html">
<Link>Resources\dashboard-ui\device.html</Link> <Link>Resources\dashboard-ui\device.html</Link>
</BundleResource> </BundleResource>
@ -571,6 +568,12 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\supporterkey.html"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\supporterkey.html">
<Link>Resources\dashboard-ui\supporterkey.html</Link> <Link>Resources\dashboard-ui\supporterkey.html</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\syncactivity.html">
<Link>Resources\dashboard-ui\syncactivity.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\syncsettings.html">
<Link>Resources\dashboard-ui\syncsettings.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\tvgenres.html"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\tvgenres.html">
<Link>Resources\dashboard-ui\tvgenres.html</Link> <Link>Resources\dashboard-ui\tvgenres.html</Link>
</BundleResource> </BundleResource>
@ -1216,9 +1219,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\dashboardpage.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\dashboardpage.js">
<Link>Resources\dashboard-ui\scripts\dashboardpage.js</Link> <Link>Resources\dashboard-ui\scripts\dashboardpage.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\dashboardsync.js">
<Link>Resources\dashboard-ui\scripts\dashboardsync.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\device.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\device.js">
<Link>Resources\dashboard-ui\scripts\device.js</Link> <Link>Resources\dashboard-ui\scripts\device.js</Link>
</BundleResource> </BundleResource>
@ -1537,6 +1537,12 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\sync.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\sync.js">
<Link>Resources\dashboard-ui\scripts\sync.js</Link> <Link>Resources\dashboard-ui\scripts\sync.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\syncactivity.js">
<Link>Resources\dashboard-ui\scripts\syncactivity.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\syncsettings.js">
<Link>Resources\dashboard-ui\scripts\syncsettings.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\thememediaplayer.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\thememediaplayer.js">
<Link>Resources\dashboard-ui\scripts\thememediaplayer.js</Link> <Link>Resources\dashboard-ui\scripts\thememediaplayer.js</Link>
</BundleResource> </BundleResource>