[Pkg-owncloud-commits] [owncloud] 88/123: Merge pull request #16323 from owncloud/enc_webdav_fixes

[David Prévot]

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit 937306b4164158471b440a890f67044ccca384fc
Merge: 8ae8600 ccbefb6
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Fri May 15 10:38:22 2015 +0200

    Merge pull request #16323 from owncloud/enc_webdav_fixes
    
    some encryption fixes

 apps/encryption/lib/keymanager.php               |  2 +-
 lib/private/encryption/keys/storage.php          | 14 +++---------
 lib/private/files/storage/wrapper/encryption.php | 27 ++++++++++++++++++++----
 lib/public/encryption/keys/istorage.php          |  3 +--
 4 files changed, 28 insertions(+), 18 deletions(-)

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