projects / nextcloud-desktop.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 101d3e5 63dbb90)
Merge pull request #2948 from nextcloud/bugfix/conflict-dialog-issue
authorFelix Weilbach <felix.weilbach@nextcloud.com>
Fri, 5 Mar 2021 13:31:59 +0000 (14:31 +0100)
committerGitHub <noreply@github.com>
Fri, 5 Mar 2021 13:31:59 +0000 (14:31 +0100)
Fix crash when opening conflict dialog


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