diff options
| author | crobibero <cody@robibe.ro> | 2020-09-01 18:24:42 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-09-01 18:24:42 -0600 |
| commit | f443c534bfac9feea4c92033e85a9aa5097ec4f5 (patch) | |
| tree | 6d0bcffc442c283f999232c54536c9d774a6f672 /Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs | |
| parent | 852213d90cd6fe3c4e7b6922ca1f8162bc34c55e (diff) | |
| parent | 506fc7cbaeb8f82716f84b125ac598ff740bf552 (diff) | |
Merge remote-tracking branch 'upstream/master' into package-install-repo
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; |