Merge pull request #6664 from nextcloud/backport/6655/stable-3.13
authorMatthieu Gallien <matthieu_gallien@yahoo.fr>
Tue, 23 Apr 2024 12:47:57 +0000 (14:47 +0200)
committerGitHub <noreply@github.com>
Tue, 23 Apr 2024 12:47:57 +0000 (14:47 +0200)
[stable-3.13] Bugfix/folder conflict disappear


Trivial merge