From: Matthieu Gallien Date: Thu, 15 Sep 2022 08:36:03 +0000 (+0200) Subject: Merge pull request #4940 from nextcloud/bugfix/debug-conflict X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~11^2~265 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1c5320af0c45d48a336011db3e698a51c517e842;p=nextcloud-desktop.git Merge pull request #4940 from nextcloud/bugfix/debug-conflict Ensure that the file being processed has had its etag properly sanitised, log etag more --- 1c5320af0c45d48a336011db3e698a51c517e842