projects / nextcloud-desktop.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 37bd3f3 6c7f810)
Merge pull request #5635 from nextcloud/feature/resolveAllConflicts
authorMatthieu Gallien <matthieu_gallien@yahoo.fr>
Wed, 17 May 2023 08:35:04 +0000 (10:35 +0200)
committerGitHub <noreply@github.com>
Wed, 17 May 2023 08:35:04 +0000 (10:35 +0200)
Feature/resolve all conflicts


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