[Pkg-owncloud-commits] [owncloud] 87/205: Merge pull request #17045 from owncloud/enc_improvements

[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 cce841c665a64aa161b023af59ac2136aaf424bf
Merge: 4b53243 95602d4
Author: Björn Schießle <bjoern at schiessle.org>
Date:   Tue Jun 23 14:30:21 2015 +0200

    Merge pull request #17045 from owncloud/enc_improvements
    
    encryption improvements

 apps/encryption/lib/migration.php                |  2 +-
 lib/private/files/storage/wrapper/encryption.php |  8 +--
 tests/lib/files/storage/wrapper/encryption.php   | 63 ++++++++++++++++++++++--
 3 files changed, 66 insertions(+), 7 deletions(-)

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