From: Matthieu Gallien Date: Tue, 23 Apr 2024 12:47:57 +0000 (+0200) Subject: Merge pull request #6664 from nextcloud/backport/6655/stable-3.13 X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~7^2~43 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5ffa359e3e3db35af9985ae905c7911559d18529;p=nextcloud-desktop.git Merge pull request #6664 from nextcloud/backport/6655/stable-3.13 [stable-3.13] Bugfix/folder conflict disappear --- 5ffa359e3e3db35af9985ae905c7911559d18529