| Age | Commit message (Collapse) | Author |
|
|
|
# Conflicts:
# Jellyfin.Api/Controllers/DynamicHlsController.cs
# MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
# MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
|
|
|
|
|
|
|
|
Remove duplicate, fix namespace
|
|
down to 580
|
|
Co-authored-by: Niels van Velzen <nielsvanvelzen@users.noreply.github.com>
|
|
|
|
filename
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Co-authored-by: dkanada <dkanada@users.noreply.github.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Removal of IPluginConfigurationPage
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|