Merge pull request #1475 from MediaBrowser/master

merge from master

2 files changed, 13 insertions, 4 deletions

diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
index 0b4dce140..7ad1c55f1 100644
--- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
+++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
@@ -1325,6 +1325,12 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\images\persistentimagefetcher.js">

       <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\images\persistentimagefetcher.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\loading\loading.css">

+      <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\loading\loading.css</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\loading\loading.js">

+      <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\loading\loading.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\paperdialoghelper\paperdialoghelper.css">

       <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\paperdialoghelper\paperdialoghelper.css</Link>

     </BundleResource>

@@ -1352,6 +1358,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\slideshow\style.css">

       <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\slideshow\style.css</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\toast\toast.js">

+      <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\toast\toast.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\fastclick\.bower.json">

       <Link>Resources\dashboard-ui\bower_components\fastclick\.bower.json</Link>

     </BundleResource>

@@ -8279,6 +8288,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\filterdialog\filterdialog.template.html">

       <Link>Resources\dashboard-ui\components\filterdialog\filterdialog.template.html</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\filterdialog\style.css">

+      <Link>Resources\dashboard-ui\components\filterdialog\style.css</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\guestinviter\guestinviter.js">

       <Link>Resources\dashboard-ui\components\guestinviter\guestinviter.js</Link>

     </BundleResource>

@@ -9122,9 +9134,6 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\pluginspage.js">

       <Link>Resources\dashboard-ui\scripts\pluginspage.js</Link>

     </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\queryfilters.js">

-      <Link>Resources\dashboard-ui\scripts\queryfilters.js</Link>

-    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\ratingdialog.js">

       <Link>Resources\dashboard-ui\scripts\ratingdialog.js</Link>

     </BundleResource>

diff --git a/SharedVersion.cs b/SharedVersion.cs
index dd370f98d..033efbbd7 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
 //[assembly: AssemblyVersion("3.0.*")]
-[assembly: AssemblyVersion("3.0.5880")]
+[assembly: AssemblyVersion("3.0.5871")]