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)
commit802d27ed0f336882a0b4b979c5e1e7a88cce0d9d
tree6d52659ca3733855fbf649dc8430775e0255366e
parentb982a17998b5b7b1f0d2da19fa6971240ab2fff3
parentb835092ae9b3ca2859a830c7d485f0c9025a6399
Merge pull request #2527 from nextcloud/improve_conflict_handling_gui

Improve conflict handling gui