[Pkg-owncloud-commits] [owncloud] 40/111: Merge pull request #5827 from owncloud/avoid_preview_errors

[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 19e03ef77f873d540626c4f7f251dd1f834bfaf0
Merge: 8d0d083 ec51825
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Thu Nov 14 05:52:51 2013 -0800

    Merge pull request #5827 from owncloud/avoid_preview_errors
    
    Use dedicated OC_Image loader methods in previews

 lib/private/preview/image.php           |    4 ++--
 lib/private/preview/movies.php          |    3 ++-
 lib/private/preview/mp3.php             |    6 ++++--
 lib/private/preview/office-cl.php       |    3 ++-
 lib/private/preview/office-fallback.php |    3 ++-
 5 files changed, 12 insertions(+), 7 deletions(-)

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