[Pkg-owncloud-commits] [owncloud] 36/50: Merge pull request #11246 from owncloud/backport-11211-stable6

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v6.0.6RC1
in repository owncloud.

commit 34a803d83e723f2ced0120e5a9343591f29343e3
Merge: 3ec5cbb 716613f
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Tue Sep 23 23:54:08 2014 +0200

    Merge pull request #11246 from owncloud/backport-11211-stable6
    
    Add a configuration switch for enabled preview mimetypes

 config/config.sample.php        | 21 ++++++++++++++++++
 lib/private/preview.php         | 37 +++++++++++++++++++++++++------
 lib/private/preview/svg.php     |  5 +++++
 lib/private/preview/unknown.php | 49 -----------------------------------------
 tests/data/testcal.ics          | 13 -----------
 tests/data/testcontact.vcf      |  6 -----
 tests/lib/preview.php           |  4 ----
 7 files changed, 56 insertions(+), 79 deletions(-)

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