[Pkg-owncloud-commits] [owncloud] 29/52: Merge pull request #6106 from owncloud/fix_preview_creation

[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 0cbe9d79baec7aa3a38dfc9b5db8b5a1eee7b930
Merge: f723bf7 b3724cd
Author: Morris Jobke <morris.jobke at gmail.com>
Date:   Thu Nov 28 12:48:19 2013 -0800

    Merge pull request #6106 from owncloud/fix_preview_creation
    
    Fix preview creation

 apps/files_trashbin/ajax/preview.php | 10 +++++++--
 apps/files_versions/ajax/preview.php |  5 +++--
 lib/private/preview.php              | 41 +++++++++++++++++++++++-------------
 3 files changed, 37 insertions(+), 19 deletions(-)

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