mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-03-25 19:07:57 -04:00
# Conflicts: # Jellyfin.Api/Controllers/DynamicHlsController.cs # MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs # MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs