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

Merge pull request #19931 from owncloud/fix-webui-upload-and-conflicts 

Fix file upload, conflict dialog, also in public link
parents ad4ef8d9 abd0ba1f
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