From: Matthieu Gallien Date: Fri, 7 Jan 2022 17:01:26 +0000 (+0100) Subject: Merge pull request #4111 from nextcloud/bugfix/do-not-display-gui-error-on-vfs-folder... X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~17^2~214 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=888cd2754073f548913750c00548cc829a837d85;p=nextcloud-desktop.git Merge pull request #4111 from nextcloud/bugfix/do-not-display-gui-error-on-vfs-folder-conflict Do not display 'Conflict when uploading some files to a folder --- 888cd2754073f548913750c00548cc829a837d85