mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-01-06 12:10:17 -05:00
# Conflicts: # Jellyfin.Api/Controllers/DynamicHlsController.cs # MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs # MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs