| author | Matthieu Gallien <matthieu.gallien@nextcloud.com> | |
| Tue, 2 May 2023 12:53:53 +0000 (14:53 +0200) | ||
| committer | Matthieu Gallien <matthieu_gallien@yahoo.fr> | |
| Wed, 17 May 2023 06:43:54 +0000 (08:43 +0200) | ||
| commit | 4bd93e39d638b47a5958c1761cb30b8ced179a16 | |
| tree | 76fee28013ec6941c71744cfe53e26ad317f8647 | tree | snapshot |
| parent | 396accd208b4baff00f2eb34b8753c06b2ec0ba2 | commit | diff |
| src/gui/ConflictDelegate.qml | diff | blob | history | |
| src/gui/ResolveConflictsDialog.qml | diff | blob | history |