From: Matthieu Gallien <matthieu_gallien@yahoo.fr>
Date: Wed, 17 May 2023 08:35:04 +0000 (+0200)
Subject: Merge pull request #5635 from nextcloud/feature/resolveAllConflicts
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~10^2~44
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d7d52a11c11796116a7004970d6a98650e5ae2ef;p=nextcloud-desktop.git

Merge pull request #5635 from nextcloud/feature/resolveAllConflicts

Feature/resolve all conflicts
---

d7d52a11c11796116a7004970d6a98650e5ae2ef