Merge pull request #5635 from nextcloud/feature/resolveAllConflicts
authorMatthieu Gallien <matthieu_gallien@yahoo.fr>
Wed, 17 May 2023 08:35:04 +0000 (10:35 +0200)
committerGitHub <noreply@github.com>
Wed, 17 May 2023 08:35:04 +0000 (10:35 +0200)
commitd7d52a11c11796116a7004970d6a98650e5ae2ef
treee2886fc20503dbcda63a02ed3729b59b86110906
parent37bd3f3db5da892ed796387a34ef26ecc51a8b28
parent6c7f81009523866f6a6e912bfb0434626739b74e
Merge pull request #5635 from nextcloud/feature/resolveAllConflicts

Feature/resolve all conflicts