Merge pull request #2720 from MediaBrowser/dev

Dev

Emby.Server.Implementations/Photos/PhotoAlbumImageProvider.cs

@@ -26,7 +26,7 @@ namespace Emby.Server.Implementations.Photos
             return items;
         }
 
-        protected string CreateImage(IHasImages item, List<BaseItem> itemsWithImages, string outputPathWithoutExtension, ImageType imageType, int imageIndex)
+        protected override string CreateImage(IHasImages item, List<BaseItem> itemsWithImages, string outputPathWithoutExtension, ImageType imageType, int imageIndex)
         {
             return CreateSingleImage(itemsWithImages, outputPathWithoutExtension, ImageType.Primary);
         }

MediaBrowser.Server.Mono/ImageEncoderHelper.cs

@@ -31,7 +31,7 @@ namespace MediaBrowser.Server.Startup.Common
                 }
                 catch (Exception ex)
                 {
-                    logger.Error("Error loading Skia: {0}. Will revert to ImageMagick.", ex.Message);
+                    logger.Info("Error loading Skia: {0}. Will revert to ImageMagick.", ex.Message);
                 }
 
                 try

MediaBrowser.WebDashboard/Api/PackageCreator.cs

@@ -101,7 +101,7 @@ namespace MediaBrowser.WebDashboard.Api
             var parent = _fileSystem.GetDirectoryName(path);
             
             return string.Equals(_basePath, parent, StringComparison.OrdinalIgnoreCase) ||
-                   string.Equals(Path.Combine(_basePath, "voice"), parent, StringComparison.OrdinalIgnoreCase);
+                   string.Equals(Path.Combine(_basePath, "offline"), parent, StringComparison.OrdinalIgnoreCase);
         }
 
         /// <summary>

SharedVersion.cs

@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.20.8")]
+[assembly: AssemblyVersion("3.2.20.9")]