projects / nextcloud-desktop.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 71f0b45 51d8cf8)
Merge pull request #2867 from nextcloud/fix_file_resolve_dialog
authorKevin Ottens <kevin.ottens@nextcloud.com>
Wed, 27 Jan 2021 08:10:32 +0000 (09:10 +0100)
committerGitHub <noreply@github.com>
Wed, 27 Jan 2021 08:10:32 +0000 (09:10 +0100)
Start file conflict resolve dialog asynchronous


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.