[Pkg-owncloud-commits] [owncloud] 65/205: Merge pull request #12546 from oparoz/patch-1

[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 a88b370dc84c4dfdcab7a128900829fbe8204ca7
Merge: ced15c4 ba3b6f9
Author: Björn Schießle <bjoern at schiessle.org>
Date:   Mon Jun 22 13:55:17 2015 +0200

    Merge pull request #12546 from oparoz/patch-1
    
    Send the mime icon if we can't generate a preview

 lib/private/preview.php | 52 +++++++++++++++++++++++++++++--------------------
 tests/lib/preview.php   | 20 +++++++++++++++++++
 2 files changed, 51 insertions(+), 21 deletions(-)

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