diff options
| author | Claus Vium <cvium@users.noreply.github.com> | 2020-09-03 14:54:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-03 14:54:00 +0200 |
| commit | 2f9b4825550c97d1432033958d7a016d8775dff9 (patch) | |
| tree | 0b896551a3f0d955122190ff6217e6bbd4e16dda /Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs | |
| parent | c7b5bc55a1ac985c46b918e4b6208ea1f4ae0b2f (diff) | |
| parent | 8c28824c8878e409ca426e4860dc3f05521f39b8 (diff) | |
Merge branch 'master' into master
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; |