| 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) | ||
| commit | 3e6b257ccd29750855d4dc963484800e8cc12640 | |
| tree | 8781b5efc117babd8b6648a5e1252d6da72bccc6 | tree | snapshot |
| parent | d17c9af044558d9017ecca348b330e06b309a97a | commit | diff |
| src/gui/conflictdialog.cpp | diff | blob | history |