[Pkg-owncloud-commits] [owncloud] 99/223: Merge pull request #8978 from owncloud/movie_preview_improvements

[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 35f7565e9b56b0550b5d79598d07fe69cb728e6a
Merge: 2b82e3c 7396e5f
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Sat Jun 14 01:01:59 2014 +0200

    Merge pull request #8978 from owncloud/movie_preview_improvements
    
    movie previews: use file directly when it's stored locally and encryption is not enabled

 lib/private/preview/movies.php | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

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