Files
jellyfin/Jellyfin.Server.Implementations/Item
Shadowghost 5231d99398 Merge remote-tracking branch 'upstream/release-12.z' into fix-user-views
# Conflicts:
#	Jellyfin.Server.Implementations/Item/ItemCountService.cs
#	src/Jellyfin.Database/Jellyfin.Database.Implementations/DescendantQueryHelper.cs
#	tests/Jellyfin.Server.Implementations.Tests/Item/ItemCountServiceTests.cs
2026-09-14 17:31:35 +02:00
..
2026-08-11 09:40:11 -04:00