[Pkg-owncloud-commits] [owncloud] 51/90: Merge pull request #13384 from owncloud/stable7-fix-13317-backport

[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 6d87922cea82ce56611080528e9d02ebcdd112b8
Merge: d534f26 0753514
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Thu Jan 15 17:27:09 2015 +0100

    Merge pull request #13384 from owncloud/stable7-fix-13317-backport
    
    Fix backport of #13317

 lib/private/files/view.php | 19 ++++++++++++++++---
 tests/lib/files/view.php   |  1 +
 2 files changed, 17 insertions(+), 3 deletions(-)

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