aboutsummaryrefslogtreecommitdiff
path: root/tests/Jellyfin.Controller.Tests/MediaEncoding
diff options
context:
space:
mode:
authorNiels van Velzen <nielsvanvelzen@users.noreply.github.com>2026-11-06 20:12:19 +0100
committerGitHub <noreply@github.com>2026-11-06 20:12:19 +0100
commit797999fc9bd49a9f0853916e2933e3ad06173503 (patch)
tree22010d5401321d03c80d717d12d758bdc95060e7 /tests/Jellyfin.Controller.Tests/MediaEncoding
parent6a5a910d1b182400b3f026226fc099f3a0ec8b51 (diff)
parentf45146706b229b50ae6297591bf87a624af25e19 (diff)
Merge pull request #18608 from Bond-009/bodgedMergeHEADmaster
Fixed bodged merge
Diffstat (limited to 'tests/Jellyfin.Controller.Tests/MediaEncoding')
0 files changed, 0 insertions, 0 deletions