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)
commitf17c52dccd0f7e0cce6c6062cf11a5ad03ac2b8d
treefd7424995e0fe936fd2c32da05432e1b96c2a7d8
parent101d3e5d7d1ea108e265916a284411fb7143ac16
parent63dbb90bbd96d3169b6186fb7a37edddf3f00d3e
Merge pull request #2948 from nextcloud/bugfix/conflict-dialog-issue

Fix crash when opening conflict dialog