Merge pull request #4940 from nextcloud/bugfix/debug-conflict
authorMatthieu Gallien <matthieu_gallien@yahoo.fr>
Thu, 15 Sep 2022 08:36:03 +0000 (10:36 +0200)
committerGitHub <noreply@github.com>
Thu, 15 Sep 2022 08:36:03 +0000 (10:36 +0200)
commit1c5320af0c45d48a336011db3e698a51c517e842
tree9054ab4c3ab682c8c8b642414612cc2fee4a7ccf
parentc4b6eae299bdf29083ca710088c7aad9d3b41473
parent0a2186f8d9bc1d513669eb00b0a8a6af50caec4a
Merge pull request #4940 from nextcloud/bugfix/debug-conflict

Ensure that the file being processed has had its etag properly sanitised, log etag more