aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-10-22 10:41:48 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-10-22 10:41:48 +0200
commit8ed021481848160867cbc881c439624e4f1add0c (patch)
tree21ae600b5cd96989558f30cb4a43efa53ee16ada /core
parentad4ef8d91c36b9351ac7c7c85b99312b1311eddf (diff)
parentabd0ba1f2593770833ed6bf886c72b1c24817ecf (diff)
downloadnextcloud-server-8ed021481848160867cbc881c439624e4f1add0c.tar.gz
nextcloud-server-8ed021481848160867cbc881c439624e4f1add0c.zip
Merge pull request #19931 from owncloud/fix-webui-upload-and-conflicts
Fix file upload, conflict dialog, also in public link
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions