[Pkg-owncloud-commits] [owncloud] 50/134: Merge pull request #7698 from owncloud/backport_7631

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit bc5145e2675be86e767c87a83eb63be6f2b43f1e
Merge: 5444955 112a277
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Wed Mar 12 23:51:45 2014 +0100

    Merge pull request #7698 from owncloud/backport_7631
    
    only enable drag&drop upload if public upload is allowed

 apps/files/js/file-upload.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git