| author | Matthieu Gallien <matthieu.gallien@nextcloud.com> | |
| Thu, 4 May 2023 10:30:13 +0000 (12:30 +0200) | ||
| committer | Matthieu Gallien <matthieu_gallien@yahoo.fr> | |
| Wed, 17 May 2023 06:43:54 +0000 (08:43 +0200) | ||
| commit | fa135a4228910e809f797d81ee5a4be154b32c43 | |
| tree | 6fa787f72eacbe457e8a65835e18bc5785b9efa3 | tree | snapshot |
| parent | 382a58c6bdb49cdd9468e91b9dded27e202b5eaa | commit | diff |
| src/gui/ResolveConflictsDialog.qml | diff | blob | history | |
| src/gui/syncconflictsmodel.cpp | diff | blob | history |