projects / nextcloud-desktop.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 71f0b45) | patch
Start file conflict resolve dialog asynchronous
authorFelix Weilbach <felix.weilbach@t-online.de>
Tue, 26 Jan 2021 10:35:39 +0000 (11:35 +0100)
committerKevin Ottens (Rebase PR Action) <er-vin@users.noreply.github.com>
Wed, 27 Jan 2021 08:01:25 +0000 (08:01 +0000)
commit51d8cf8102adabf17b946c9991ef34c62be32153
treeed8c1772ebb73f437bb0bc0335c183aeb59f0987tree | snapshot
parent71f0b45412c318bf127ab32bc791591a87304fd1commit | diff
Start file conflict resolve dialog asynchronous

Fixes #2804

Signed-off-by: Felix Weilbach <felix.weilbach@t-online.de>
src/gui/tray/ActivityListModel.cpp diff | blob | history
src/gui/tray/ActivityListModel.h diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.