diff options
| author | Bond-009 <bond.009@outlook.com> | 2019-01-31 18:44:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-31 18:44:36 +0100 |
| commit | 2a1f6361a5fea4d00888446b736829e341982f35 (patch) | |
| tree | b8962a7bd7f0926366fcbd57b8e353b2ab927a5f /Jellyfin.Server | |
| parent | 055e43eda72dbf77a91ca22b5b007161c9d75c46 (diff) | |
| parent | ffcf6bdd3aaad5068decf84b0400e433fdb8323c (diff) | |
Merge branch 'master' into locale
Diffstat (limited to 'Jellyfin.Server')
| -rw-r--r-- | Jellyfin.Server/Jellyfin.Server.csproj | 1 | ||||
| -rw-r--r-- | Jellyfin.Server/Program.cs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Jellyfin.Server/Jellyfin.Server.csproj b/Jellyfin.Server/Jellyfin.Server.csproj index 9b698628e0..5a4bf5149d 100644 --- a/Jellyfin.Server/Jellyfin.Server.csproj +++ b/Jellyfin.Server/Jellyfin.Server.csproj @@ -49,6 +49,7 @@ <ProjectReference Include="..\Emby.Drawing\Emby.Drawing.csproj" /> <ProjectReference Include="..\Emby.IsoMounting\IsoMounter\IsoMounter.csproj" /> <ProjectReference Include="..\Emby.Server.Implementations\Emby.Server.Implementations.csproj" /> + <ProjectReference Include="..\Jellyfin.Drawing.Skia\Jellyfin.Drawing.Skia.csproj" /> </ItemGroup> </Project> diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs index c8861c65c8..513d9674ed 100644 --- a/Jellyfin.Server/Program.cs +++ b/Jellyfin.Server/Program.cs @@ -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; |