jellyfin/tests/Jellyfin.Server.Implementations.Tests/Library/SqlSearchProviderTests.cs, branch master Unnamed repository; edit this file 'description' to name the repository. https://git.lodewillems.com/jellyfin/atom?h=master 2026-09-15T15:13:48Z Backport pull request #17842 from jellyfin/release-12.z 2026-09-15T15:13:48Z Shadowghost Shadowghost@users.noreply.github.com 2026-09-15T15:13:48Z urn:sha1:8150ee2484dabed61718ef43d5c98cdd2c0fa01c Fix versions of a video still listing separately from their group and preserve manual merges Original-merge: cabec7ec28df671e3bb1c360c32db60b085f4084 Merged-by: crobibero <cody@robibe.ro> Backported-by: Cody Robibero <cody@robibe.ro>