]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 24271cf 7ecb969)
Merge pull request #21254 from owncloud/files-uploadcanceliconfix
authorThomas Müller <thomas.mueller@tmit.eu>
Mon, 28 Dec 2015 09:21:38 +0000 (10:21 +0100)
committerThomas Müller <thomas.mueller@tmit.eu>
Mon, 28 Dec 2015 09:21:38 +0000 (10:21 +0100)
Correctly render uploadtext indicator only on folders

1  2 
apps/files/js/filelist.js patch | diff1 | diff2 | blob | history

diff --cc apps/files/js/filelist.js
Simple merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server