| author | Matthieu Gallien <matthieu.gallien@nextcloud.com> | |
| Tue, 16 May 2023 07:54:09 +0000 (09:54 +0200) | ||
| committer | Matthieu Gallien <matthieu_gallien@yahoo.fr> | |
| Wed, 17 May 2023 06:43:54 +0000 (08:43 +0200) | ||
| commit | 8d81257db0f01a9aabee27ab6861bf5adc25dcfd | |
| tree | b0bffa13b4ff818d9c96a6b2925861db658fa6aa | tree | snapshot |
| parent | b285b89605a016223004b0a14aaf3440e1334534 | commit | diff |
| src/gui/ResolveConflictsDialog.qml | diff | blob | history |