mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-24 06:30:56 +02:00
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts: MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
This commit is contained in:
commit
e8ac0a988d