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

Merge pull request #19417 from owncloud/files-upload-checkconflictbeforeupload 

Show conflict dialog before upload when possible
parents 54b50730 cc8efaa0
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