diff options
| author | crobibero <cody@robibe.ro> | 2020-08-31 08:00:05 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-08-31 08:00:05 -0600 |
| commit | bd66fd25df772f3fd352fdda58e71474e255400a (patch) | |
| tree | a6102da6a9f120d7c887f460c5d603be92ea199f /Emby.Server.Implementations/HttpServer/HttpListenerHost.cs | |
| parent | 9626101c9f8d0acceb2ecf97bed502c272d6e4f6 (diff) | |
| parent | 0424d09b8daf3626fd7de65b601e707afdb00599 (diff) | |
Merge remote-tracking branch 'upstream/master' into 3.1.7
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; |