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)
commitc7d9e11d89b537865a0ab674946e41d81b2fb928
treeed8c1772ebb73f437bb0bc0335c183aeb59f0987
parent71f0b45412c318bf127ab32bc791591a87304fd1
parent51d8cf8102adabf17b946c9991ef34c62be32153
Merge pull request #2867 from nextcloud/fix_file_resolve_dialog

Start file conflict resolve dialog asynchronous