projects / nextcloud-desktop.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b982a17 b835092)
Merge pull request #2527 from nextcloud/improve_conflict_handling_gui
authorKevin Ottens <kevin.ottens@nextcloud.com>
Thu, 22 Oct 2020 16:27:45 +0000 (18:27 +0200)
committerGitHub <noreply@github.com>
Thu, 22 Oct 2020 16:27:45 +0000 (18:27 +0200)
Improve conflict handling gui


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