[Pkg-owncloud-commits] [owncloud] 15/32: Merge pull request #8260 from owncloud/stable6-backport-8183-and-co

[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 1041617a4e279e85b4e4aab11fbac8cde30336d2
Merge: a314508 9b36224
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Wed Apr 23 12:04:09 2014 +0200

    Merge pull request #8260 from owncloud/stable6-backport-8183-and-co
    
    Backport of #8183 and #8197

 lib/base.php                         |  29 ++++++
 lib/private/connector/sabre/file.php |   7 +-
 lib/private/files/type/detection.php |  36 ++++++-
 lib/private/helper.php               |  10 ++
 lib/private/json.php                 |   2 -
 lib/private/mimetypes.list.php       | 192 ++++++++++++++++++++---------------
 lib/private/template.php             |  23 -----
 tests/lib/helper.php                 |  12 +++
 8 files changed, 197 insertions(+), 114 deletions(-)

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