Merge pull request #7646 from nextcloud/backport/7639/stable-3.15
authorMatthieu Gallien <matthieu.gallien@nextcloud.com>
Thu, 12 Dec 2024 11:17:11 +0000 (12:17 +0100)
committerGitHub <noreply@github.com>
Thu, 12 Dec 2024 11:17:11 +0000 (12:17 +0100)
commit1a34110d6cf106fdce9e0d39ae0be1f52a0cb0e2
tree14f5bfbcc9e1609af3b7843798f795ef5b3eaf91
parentd4cb6773f5b0155ac0f3f577f09d064f50806457
parentff0030ec573ef4071dc21d254092b4ed1aa7278e
Merge pull request #7646 from nextcloud/backport/7639/stable-3.15

[stable-3.15] Include folders when displaying the local metadata about a conflict.