diff options
| author | crobibero <cody@robibe.ro> | 2020-09-03 08:06:40 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-09-03 08:06:40 -0600 |
| commit | bebb0afb528636659bfb4d635acf77c4e83daa55 (patch) | |
| tree | 273f087464d28a7b3fa8877477a809ee42d63ebe /Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs | |
| parent | 1d9285c59443692008514aea0a3a30ff11b468de (diff) | |
| parent | 3711a1978e8a400aa28dd75ce8ffb08ac43106e1 (diff) | |
Merge remote-tracking branch 'upstream/master' into api-doc-css
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; |