[Pkg-owncloud-commits] [owncloud] 46/74: Merge pull request #12131 from owncloud/stable7-enc-recoverykeywithextstoragefix

[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 3ff1f879e014c6be738b85fc7b9de6ca154520cc
Merge: f64c6c9 0ab7708
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Thu Nov 20 16:43:20 2014 +0100

    Merge pull request #12131 from owncloud/stable7-enc-recoverykeywithextstoragefix
    
    [stable7] Fix file upload to ext storage when recovery key is enabled

 apps/files_encryption/lib/util.php   | 30 ++++++++++++++++++++---------
 apps/files_encryption/tests/util.php | 37 ++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 9 deletions(-)


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