[Pkg-owncloud-commits] [owncloud] 36/62: Merge pull request #16861 from owncloud/stable8-backport-16840

[David Prévot]

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

taffit pushed a commit to annotated tag v8.0.5beta
in repository owncloud.

commit 75c7554f62304e63b8eb8c02a3412e4a6f46d662
Merge: c391f74 083356f
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Wed Jun 10 15:53:45 2015 +0200

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

 apps/files_sharing/lib/controllers/sharecontroller.php  | 1 +
 apps/files_sharing/templates/public.php                 | 2 +-
 apps/files_sharing/tests/controller/sharecontroller.php | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

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