[Pkg-owncloud-commits] [owncloud] 356/457: Merge pull request #16840 from owncloud/fix-video-preview

[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 b9c7b5575a7d230ee6aa5e2f314d18661d3828be
Merge: 9d90421 7550bf0
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Tue Jun 9 22:32:13 2015 +0200

    Merge pull request #16840 from owncloud/fix-video-preview
    
    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