diff options
| author | crobibero <cody@robibe.ro> | 2020-09-01 18:24:42 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-09-01 18:24:42 -0600 |
| commit | f443c534bfac9feea4c92033e85a9aa5097ec4f5 (patch) | |
| tree | 6d0bcffc442c283f999232c54536c9d774a6f672 /Jellyfin.Api/WebSocketListeners | |
| parent | 852213d90cd6fe3c4e7b6922ca1f8162bc34c55e (diff) | |
| parent | 506fc7cbaeb8f82716f84b125ac598ff740bf552 (diff) | |
Merge remote-tracking branch 'upstream/master' into package-install-repo
Diffstat (limited to 'Jellyfin.Api/WebSocketListeners')
| -rw-r--r-- | Jellyfin.Api/WebSocketListeners/ActivityLogWebSocketListener.cs | 2 | ||||
| -rw-r--r-- | Jellyfin.Api/WebSocketListeners/ScheduledTasksWebSocketListener.cs | 2 |
2 files changed, 2 insertions, 2 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 diff --git a/Jellyfin.Api/WebSocketListeners/ScheduledTasksWebSocketListener.cs b/Jellyfin.Api/WebSocketListeners/ScheduledTasksWebSocketListener.cs index 12f815ff7..8a966c137 100644 --- a/Jellyfin.Api/WebSocketListeners/ScheduledTasksWebSocketListener.cs +++ b/Jellyfin.Api/WebSocketListeners/ScheduledTasksWebSocketListener.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Jellyfin.Data.Events; using MediaBrowser.Controller.Net; -using MediaBrowser.Model.Events; using MediaBrowser.Model.Tasks; using Microsoft.Extensions.Logging; |