projects / nextcloud-desktop.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 75a97bd 8c4bd2b)
Merge pull request #2714 from nextcloud/ensure_sync_after_conflict_resolution
authorCamila <hello@camila.codes>
Tue, 15 Dec 2020 09:48:43 +0000 (10:48 +0100)
committerGitHub <noreply@github.com>
Tue, 15 Dec 2020 09:48:43 +0000 (10:48 +0100)
Ensure a sync happens after a conflict resolution


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