diff options
| author | crobibero <cody@robibe.ro> | 2020-08-31 10:32:28 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-08-31 10:32:28 -0600 |
| commit | 95402df88408b96300e627b9962d0e4db2e4c7c5 (patch) | |
| tree | 91cc4d6c271e99256a39f3cacbe1a49bb40ef71a /Emby.Server.Implementations/Devices/DeviceManager.cs | |
| parent | e48df7da5e3d3eb81f68e71c0fe27a64063f00ac (diff) | |
| parent | 95142643f6c98fe4380c63ba9b3055fd3a637466 (diff) | |
Merge remote-tracking branch 'upstream/master' into default-http-client
Diffstat (limited to 'Emby.Server.Implementations/Devices/DeviceManager.cs')
| -rw-r--r-- | Emby.Server.Implementations/Devices/DeviceManager.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/Devices/DeviceManager.cs b/Emby.Server.Implementations/Devices/DeviceManager.cs index cc4b407f5..f98c694c4 100644 --- a/Emby.Server.Implementations/Devices/DeviceManager.cs +++ b/Emby.Server.Implementations/Devices/DeviceManager.cs @@ -7,13 +7,13 @@ using System.IO; using System.Linq; using Jellyfin.Data.Entities; using Jellyfin.Data.Enums; +using Jellyfin.Data.Events; using MediaBrowser.Common.Extensions; using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Devices; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Security; using MediaBrowser.Model.Devices; -using MediaBrowser.Model.Events; using MediaBrowser.Model.Querying; using MediaBrowser.Model.Serialization; using MediaBrowser.Model.Session; |
