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

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

Browse Source
This commit is contained in:
Luke Pulverenti 2016-10-20 15:27:31 -04:00
commit d2d49b6b76
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1692,6 +1692,12 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\refreshdialog\refreshdialog.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\refreshdialog\refreshdialog.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\refreshdialog\refreshdialog.js</Link> <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\refreshdialog\refreshdialog.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\registrationservices\registrationservices.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\registrationservices\registrationservices.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\registrationservices\style.css">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\registrationservices\style.css</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\require\requirecss.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\require\requirecss.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\require\requirecss.js</Link> <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\require\requirecss.js</Link>
</BundleResource> </BundleResource>
@ -2607,8 +2613,8 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\vibrant\website.coffee"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\vibrant\website.coffee">
<Link>Resources\dashboard-ui\bower_components\vibrant\website.coffee</Link> <Link>Resources\dashboard-ui\bower_components\vibrant\website.coffee</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\vibrant\dist\Vibrant.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\vibrant\dist\vibrant.js">
<Link>Resources\dashboard-ui\bower_components\vibrant\dist\Vibrant.js</Link> <Link>Resources\dashboard-ui\bower_components\vibrant\dist\vibrant.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\vibrant\dist\vibrant.min.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\vibrant\dist\vibrant.min.js">
<Link>Resources\dashboard-ui\bower_components\vibrant\dist\vibrant.min.js</Link> <Link>Resources\dashboard-ui\bower_components\vibrant\dist\vibrant.min.js</Link>
@ -2673,6 +2679,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\humanedate.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\humanedate.js">
<Link>Resources\dashboard-ui\components\humanedate.js</Link> <Link>Resources\dashboard-ui\components\humanedate.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\iap.js">
<Link>Resources\dashboard-ui\components\iap.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\remotecontrol.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\remotecontrol.js">
<Link>Resources\dashboard-ui\components\remotecontrol.js</Link> <Link>Resources\dashboard-ui\components\remotecontrol.js</Link>
</BundleResource> </BundleResource>
@ -3396,9 +3405,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\pluginspage.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\pluginspage.js">
<Link>Resources\dashboard-ui\scripts\pluginspage.js</Link> <Link>Resources\dashboard-ui\scripts\pluginspage.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\registrationservices.js">
<Link>Resources\dashboard-ui\scripts\registrationservices.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\remotecontrol.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\remotecontrol.js">
<Link>Resources\dashboard-ui\scripts\remotecontrol.js</Link> <Link>Resources\dashboard-ui\scripts\remotecontrol.js</Link>
</BundleResource> </BundleResource>