Merge pull request #5061 from nextcloud/backport/4970/stable-3.6
authorMatthieu Gallien <matthieu_gallien@yahoo.fr>
Tue, 18 Oct 2022 10:09:33 +0000 (12:09 +0200)
committerGitHub <noreply@github.com>
Tue, 18 Oct 2022 10:09:33 +0000 (12:09 +0200)
[stable-3.6] Improve handling of file name clashes


Trivial merge