Merge branch 'master' into locale

This commit is contained in:
Bond-009
2019-01-31 18:44:36 +01:00
committed by GitHub
137 changed files with 647 additions and 956 deletions

View File

@@ -13,6 +13,7 @@ using Emby.Server.Implementations;
using Emby.Server.Implementations.EnvironmentInfo;
using Emby.Server.Implementations.IO;
using Emby.Server.Implementations.Networking;
using Jellyfin.Drawing.Skia;
using MediaBrowser.Common.Configuration;
using MediaBrowser.Controller.Drawing;
using MediaBrowser.Model.Globalization;