diff options
| author | Patrick Barron <barronpm@gmail.com> | 2020-06-04 16:39:50 -0400 |
|---|---|---|
| committer | Patrick Barron <barronpm@gmail.com> | 2020-06-04 16:52:23 -0400 |
| commit | 06f9cde22f32c65b6b4d1713149de2de2be60000 (patch) | |
| tree | 9600bba80c72d259360079d965511e010be739a5 /MediaBrowser.Common/Configuration/IConfigurationManager.cs | |
| parent | 585fdbad396a089e11717eb6ce52e60a07e900e9 (diff) | |
| parent | 836741f2aa6d2140051a50f746602e4b8c63a231 (diff) | |
Merge branch 'master' into userdb-efcore
# Conflicts:
# Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
# Emby.Server.Implementations/Library/UserManager.cs
# Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
# Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
# Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
# Emby.Server.Implementations/TV/TVSeriesManager.cs
# Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
Diffstat (limited to 'MediaBrowser.Common/Configuration/IConfigurationManager.cs')
| -rw-r--r-- | MediaBrowser.Common/Configuration/IConfigurationManager.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Common/Configuration/IConfigurationManager.cs b/MediaBrowser.Common/Configuration/IConfigurationManager.cs index caf2edd83..fe726090d 100644 --- a/MediaBrowser.Common/Configuration/IConfigurationManager.cs +++ b/MediaBrowser.Common/Configuration/IConfigurationManager.cs @@ -24,7 +24,7 @@ namespace MediaBrowser.Common.Configuration event EventHandler<ConfigurationUpdateEventArgs> NamedConfigurationUpdated; /// <summary> - /// Gets or sets the application paths. + /// Gets the application paths. /// </summary> /// <value>The application paths.</value> IApplicationPaths CommonApplicationPaths { get; } |