[Pkg-owncloud-commits] [owncloud] 57/62: Merge pull request #17001 from owncloud/fix_15664

[David Prévot]

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

taffit pushed a commit to annotated tag v8.0.5beta
in repository owncloud.

commit 1744333f5fb88e05dda2e4cf9f40af656c65a387
Merge: 1bdd3f7 48c17d2
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Mon Jun 22 20:12:09 2015 +0200

    Merge pull request #17001 from owncloud/fix_15664
    
    only try to determine unencrypted size if a encrypted file is read

 apps/files_encryption/lib/proxy.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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