aboutsummaryrefslogtreecommitdiff
path: root/Jellyfin.Api/WebSocketListeners/ActivityLogWebSocketListener.cs
diff options
context:
space:
mode:
authorcrobibero <cody@robibe.ro>2020-09-03 10:37:35 -0600
committercrobibero <cody@robibe.ro>2020-09-03 10:37:35 -0600
commitb035a642d27ea4b0a22e9a539c641a055bac056b (patch)
tree9b7ad34430d923a841a5789f49bb4dde2578c339 /Jellyfin.Api/WebSocketListeners/ActivityLogWebSocketListener.cs
parent5e6cdc8842c3c81eb7e0363e6d36fac6630304e1 (diff)
parent645db0524fb1368135ecea9e5b776ad9b490b17b (diff)
Merge remote-tracking branch 'upstream/master' into plugin-install
Diffstat (limited to 'Jellyfin.Api/WebSocketListeners/ActivityLogWebSocketListener.cs')
-rw-r--r--Jellyfin.Api/WebSocketListeners/ActivityLogWebSocketListener.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Jellyfin.Api/WebSocketListeners/ActivityLogWebSocketListener.cs b/Jellyfin.Api/WebSocketListeners/ActivityLogWebSocketListener.cs
index 6395b8d62..849b3b709 100644
--- a/Jellyfin.Api/WebSocketListeners/ActivityLogWebSocketListener.cs
+++ b/Jellyfin.Api/WebSocketListeners/ActivityLogWebSocketListener.cs
@@ -1,8 +1,8 @@
using System;
using System.Threading.Tasks;
+using Jellyfin.Data.Events;
using MediaBrowser.Controller.Net;
using MediaBrowser.Model.Activity;
-using MediaBrowser.Model.Events;
using Microsoft.Extensions.Logging;
namespace Jellyfin.Api.WebSocketListeners