[Pkg-owncloud-commits] [owncloud] 12/36: Merge pull request #16863 from owncloud/stable7-backport-16840

[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 532a919a0c5905b95949c653f8de406430a4ef0f
Merge: 429fb87 7ca01a6
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Wed Jun 10 15:53:18 2015 +0200

    Merge pull request #16863 from owncloud/stable7-backport-16840
    
    [stable7] Disable video preview if previews are disabled

 apps/files_sharing/public.php           | 1 +
 apps/files_sharing/templates/public.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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