diff options
| author | crobibero <cody@robibe.ro> | 2020-09-03 12:14:11 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-09-03 12:14:11 -0600 |
| commit | a523ff840c4f4a83800bca02280e5b0f7765658b (patch) | |
| tree | 5178a9806f056266ab3c28554ef4dc2fe46e255d /Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs | |
| parent | cb44f16068bb66db7e35e473530c0a85583c2511 (diff) | |
| parent | 645db0524fb1368135ecea9e5b776ad9b490b17b (diff) | |
Merge remote-tracking branch 'upstream/master' into output-formatters
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; |