projects / nextcloud-desktop.git / commit
| author | Matthieu Gallien <matthieu.gallien@nextcloud.com> | |
| Fri, 28 Apr 2023 12:54:55 +0000 (14:54 +0200) | ||
| committer | Matthieu Gallien <matthieu_gallien@yahoo.fr> | |
| Wed, 17 May 2023 06:43:54 +0000 (08:43 +0200) | ||
| commit | 396accd208b4baff00f2eb34b8753c06b2ec0ba2 | |
| tree | 2b3e168717f182564793dd411a9d12499d0200f3 | tree | snapshot |
| parent | 1491c134c3fd9326e401c31fd68db9c2328182ba | commit | diff |
| src/gui/ConflictDelegate.qml | diff | blob | history | |
| src/gui/ResolveConflictsDialog.qml | diff | blob | history |