mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-11-16 02:18:54 -07:00
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 |
||
---|---|---|
.. | ||
EncodingHelper.cs | ||
EncodingJobInfo.cs | ||
EncodingJobOptions.cs | ||
IAttachmentExtractor.cs | ||
IEncodingManager.cs | ||
ImageEncodingOptions.cs | ||
IMediaEncoder.cs | ||
ISubtitleEncoder.cs | ||
JobLogger.cs | ||
MediaEncoderHelpers.cs | ||
MediaInfoRequest.cs |