Skip to content
Commit 3564a837 authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge pull request #19521 from owncloud/files-conflictdialog-loadpromise 

Make sure the conflict dialog is loaded before adding conflicts
parents d0f6bfe7 5dff9d88
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment