projects / nextcloud-desktop.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d4cb677 ff0030e)
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)
[stable-3.15] Include folders when displaying the local metadata about a conflict.


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.