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)
commitc50b1cc37cb4de749ae81d343fbfc822fe78f36a
treeb183dad3d088fb052790e09cb061da286ab11111
parent75a97bdaf312b09cff2f96a5e42d772091b73e49
parent8c4bd2bb5286bbafbba1c5c45ae0b625257d5f88
Merge pull request #2714 from nextcloud/ensure_sync_after_conflict_resolution

Ensure a sync happens after a conflict resolution