From: Matthieu Gallien Date: Sat, 10 Sep 2022 09:11:50 +0000 (+0200) Subject: Merge pull request #4914 from nextcloud/bugfix/conflict-resolution-when-selecting... X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~11^2~280 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=98036079162138ed9a6943ed8d03792f716800ca;p=nextcloud-desktop.git Merge pull request #4914 from nextcloud/bugfix/conflict-resolution-when-selecting-folder Bugfix/conflict resolution when selecting folder --- 98036079162138ed9a6943ed8d03792f716800ca