[Pkg-owncloud-commits] [owncloud] 64/85: Merge pull request #9015 from owncloud/stable6-downloadwithdisabledzip

[David Prévot]

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

taffit pushed a commit to branch 6.0
in repository owncloud.

commit 04817fb0f3a46800d319b52271fdf5f800a21e4e
Merge: bca536e 8ef1542
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Fri Jun 13 13:09:41 2014 +0200

    Merge pull request #9015 from owncloud/stable6-downloadwithdisabledzip
    
    [stable6] Fix public download link when zip download is disabled

 apps/files/js/fileactions.js    | 11 ++++++++---
 apps/files_sharing/js/public.js |  8 ++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

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