From: Kevin Ottens Date: Thu, 22 Oct 2020 16:27:45 +0000 (+0200) Subject: Merge pull request #2527 from nextcloud/improve_conflict_handling_gui X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~22^2~95 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=802d27ed0f336882a0b4b979c5e1e7a88cce0d9d;p=nextcloud-desktop.git Merge pull request #2527 from nextcloud/improve_conflict_handling_gui Improve conflict handling gui --- 802d27ed0f336882a0b4b979c5e1e7a88cce0d9d