michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev

Browse Source
This commit is contained in:
Luke Pulverenti 2015-08-31 00:10:12 -04:00
commit 42712d42aa
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@
<OutputType>Exe</OutputType>
<RootNamespace>MediaBrowser.Server.Mac</RootNamespace>
<MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
<AssemblyName>MediaBrowser.Server.Mac</AssemblyName>
<AssemblyName>Emby.Server.Mac</AssemblyName>
<ApplicationIcon>..\MediaBrowser.WebDashboard\dashboard-ui\css\images\favicon.ico</ApplicationIcon>
<ReleaseVersion>
</ReleaseVersion>
@ -3250,9 +3250,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\nowplayingbar.css">
<Link>Resources\dashboard-ui\css\nowplayingbar.css</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\pluginupdates.css">
<Link>Resources\dashboard-ui\css\pluginupdates.css</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\remotecontrol.css">
<Link>Resources\dashboard-ui\css\remotecontrol.css</Link>
</BundleResource>