Merge pull request #7639 from nextcloud/bugfix/conflict
authorMatthieu Gallien <matthieu.gallien@nextcloud.com>
Thu, 12 Dec 2024 10:44:39 +0000 (11:44 +0100)
committerGitHub <noreply@github.com>
Thu, 12 Dec 2024 10:44:39 +0000 (11:44 +0100)
commite5db1535eaabf952fcf4913b6a10fed88a0c3833
tree2eb5edbbcaf00464931072ace6884eb48887e002
parent2badd54a2cb2d4a0c189e51a46c7f67e557deac8
parent90bcf65ee69f2ffa8476b22d3bb3b5087f2ff5af
Merge pull request #7639 from nextcloud/bugfix/conflict

Include folders when displaying the local metadata about a conflict.