projects / nextcloud-desktop.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a6867f9 2a529ee)
Merge pull request #4914 from nextcloud/bugfix/conflict-resolution-when-selecting...
authorMatthieu Gallien <matthieu_gallien@yahoo.fr>
Sat, 10 Sep 2022 09:11:50 +0000 (11:11 +0200)
committerGitHub <noreply@github.com>
Sat, 10 Sep 2022 09:11:50 +0000 (11:11 +0200)
Bugfix/conflict resolution when selecting folder


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