projects / nextcloud-desktop.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4bd93e3) | patch
replace "OK" button by "Resolve conflicts" to help users
authorMatthieu Gallien <matthieu.gallien@nextcloud.com>
Wed, 3 May 2023 11:59:29 +0000 (13:59 +0200)
committerMatthieu Gallien <matthieu_gallien@yahoo.fr>
Wed, 17 May 2023 06:43:54 +0000 (08:43 +0200)
commit8f61d539da2dc9c0da44f5eb4408cb82e3227ea4
treec61f1f0325062552d687aea01118d6e934027d5etree | snapshot
parent4bd93e39d638b47a5958c1761cb30b8ced179a16commit | diff
replace "OK" button by "Resolve conflicts" to help users

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
src/gui/ResolveConflictsDialog.qml diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.