[Pkg-owncloud-commits] [owncloud] 76/129: Merge pull request #19956 from owncloud/stable8.2-fix-webui-upload-and-conflicts

[David Prévot]

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit 8f04555e227960a639c6773402e1129821b28eae
Merge: 74a33b0 d3d18b1
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Wed Oct 21 20:19:37 2015 +0200

    Merge pull request #19956 from owncloud/stable8.2-fix-webui-upload-and-conflicts
    
    [stable8.2] Fix file upload, conflict dialog, also in public link

 apps/files/js/file-upload.js          | 44 ++++++++++++----
 apps/files/tests/js/fileUploadSpec.js | 96 +++++++++++++++++++++++++++++++++++
 2 files changed, 129 insertions(+), 11 deletions(-)

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