diff options
| author | crobibero <cody@robibe.ro> | 2020-09-03 10:37:35 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-09-03 10:37:35 -0600 |
| commit | b035a642d27ea4b0a22e9a539c641a055bac056b (patch) | |
| tree | 9b7ad34430d923a841a5789f49bb4dde2578c339 /Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs | |
| parent | 5e6cdc8842c3c81eb7e0363e6d36fac6630304e1 (diff) | |
| parent | 645db0524fb1368135ecea9e5b776ad9b490b17b (diff) | |
Merge remote-tracking branch 'upstream/master' into plugin-install
Diffstat (limited to 'Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs')
| -rw-r--r-- | Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs b/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs index a15295fca..f05a30a89 100644 --- a/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs +++ b/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs @@ -2,11 +2,11 @@ using System; using System.Globalization; using System.IO; using Emby.Server.Implementations.AppBase; +using Jellyfin.Data.Events; using MediaBrowser.Common.Configuration; using MediaBrowser.Controller; using MediaBrowser.Controller.Configuration; using MediaBrowser.Model.Configuration; -using MediaBrowser.Model.Events; using MediaBrowser.Model.IO; using MediaBrowser.Model.Serialization; using Microsoft.Extensions.Logging; |