diff options
| author | David Ullmer <davidullmer@outlook.de> | 2021-08-10 14:03:21 +0200 |
|---|---|---|
| committer | David Ullmer <davidullmer@outlook.de> | 2021-08-10 14:03:21 +0200 |
| commit | 45e0f7893ba8f53827983109557447d2c0c8adcf (patch) | |
| tree | 05ba6fec826a6bcf4cdb17aa1ccfa6939358052c /Emby.Server.Implementations/HttpServer/WebSocketConnection.cs | |
| parent | b5880c26808a6d7f183acb3f7977b42e13ccbf8a (diff) | |
| parent | 854bb79ae8b1e7004c731939e54e52ef937abe47 (diff) | |
Merge remote-tracking branch 'upstream/master' into localization-test
Diffstat (limited to 'Emby.Server.Implementations/HttpServer/WebSocketConnection.cs')
| -rw-r--r-- | Emby.Server.Implementations/HttpServer/WebSocketConnection.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs b/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs index 06acb5606..5d38ea0ca 100644 --- a/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs +++ b/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs @@ -1,5 +1,3 @@ -#nullable enable - using System; using System.Buffers; using System.IO.Pipelines; @@ -9,7 +7,7 @@ using System.Text; using System.Text.Json; using System.Threading; using System.Threading.Tasks; -using MediaBrowser.Common.Json; +using Jellyfin.Extensions.Json; using MediaBrowser.Controller.Net; using MediaBrowser.Model.Net; using MediaBrowser.Model.Session; |