06f9cde22f
# 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 |
||
---|---|---|
.. | ||
AccessSchedule.cs | ||
BaseApplicationConfiguration.cs | ||
EncodingOptions.cs | ||
ImageOption.cs | ||
ImageSavingConvention.cs | ||
LibraryOptions.cs | ||
MetadataConfiguration.cs | ||
MetadataOptions.cs | ||
MetadataPlugin.cs | ||
MetadataPluginSummary.cs | ||
MetadataPluginType.cs | ||
ServerConfiguration.cs | ||
UserConfiguration.cs | ||
XbmcMetadataOptions.cs |