| author | Kevin Ottens <kevin.ottens@nextcloud.com> | |
| Mon, 26 Oct 2020 12:58:34 +0000 (13:58 +0100) | ||
| committer | Kevin Ottens (Rebase PR Action) <er-vin@users.noreply.github.com> | |
| Mon, 26 Oct 2020 14:45:46 +0000 (14:45 +0000) |
| src/gui/conflictdialog.cpp | patch | blob | history |