From: Matthieu Gallien Date: Thu, 12 Dec 2024 11:17:11 +0000 (+0100) Subject: Merge pull request #7646 from nextcloud/backport/7639/stable-3.15 X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~4^2~11 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1a34110d6cf106fdce9e0d39ae0be1f52a0cb0e2;p=nextcloud-desktop.git Merge pull request #7646 from nextcloud/backport/7639/stable-3.15 [stable-3.15] Include folders when displaying the local metadata about a conflict. --- 1a34110d6cf106fdce9e0d39ae0be1f52a0cb0e2