| author | Claudio Cambra <claudio.cambra@nextcloud.com> | |
| Tue, 23 May 2023 16:30:53 +0000 (00:30 +0800) | ||
| committer | backportbot-nextcloud[bot] <backportbot-nextcloud[bot]@users.noreply.github.com> | |
| Tue, 30 May 2023 08:40:52 +0000 (08:40 +0000) | ||
| commit | afdf4f0ebc3f23353b1955994c45e3d0ddbe4afc | |
| tree | 3e6ac72afe8a745db6a9aedc43d40bf330f047ab | tree | snapshot |
| parent | 9fc46aeabe2740d68b8e41e813dccc3e3be5a6ad | commit | diff |
| src/gui/ConflictItemFileInfo.qml | diff | blob | history | |
| src/gui/ResolveConflictsDialog.qml | diff | blob | history |