diff options
| author | Bond-009 <bond.009@outlook.com> | 2019-01-30 16:55:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-30 16:55:07 +0100 |
| commit | d0f2b3a747a015789326793d7b5f480748815f9b (patch) | |
| tree | 15788fd4967e90039432b9036428b25200490ca8 /Jellyfin.Server | |
| parent | 08b63a7c11d5db9126c48e644b090223f86f0eb8 (diff) | |
| parent | ffcf6bdd3aaad5068decf84b0400e433fdb8323c (diff) | |
Merge branch 'master' into startuptasks
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 f64f50cd7c..66586d4e4f 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; |