diff options
| author | David Ullmer <daullmer@gmail.com> | 2020-08-31 16:16:01 +0200 |
|---|---|---|
| committer | David Ullmer <daullmer@gmail.com> | 2020-08-31 16:16:01 +0200 |
| commit | b7c07f682152529a9993cd0fb9760ab668d4c930 (patch) | |
| tree | a40f59efb5e6e612df47673359c1d20c72a78101 /Emby.Server.Implementations/HttpServer/HttpListenerHost.cs | |
| parent | 9165dc3b3a94714da307079413f62326d5e585ef (diff) | |
| parent | 4cc7406fe92b468f8a4257d7c40bf1e28f2a3404 (diff) | |
Merge branch 'master' into library-pictures
Diffstat (limited to 'Emby.Server.Implementations/HttpServer/HttpListenerHost.cs')
| -rw-r--r-- | Emby.Server.Implementations/HttpServer/HttpListenerHost.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs index dafdd5b7b..fe39bb4b2 100644 --- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs +++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs @@ -12,13 +12,13 @@ using System.Threading; using System.Threading.Tasks; using Emby.Server.Implementations.Services; using Emby.Server.Implementations.SocketSharp; +using Jellyfin.Data.Events; using MediaBrowser.Common.Extensions; using MediaBrowser.Common.Net; using MediaBrowser.Controller; using MediaBrowser.Controller.Authentication; using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Net; -using MediaBrowser.Model.Events; using MediaBrowser.Model.Globalization; using MediaBrowser.Model.Serialization; using MediaBrowser.Model.Services; |