[Pkg-owncloud-commits] [owncloud] 163/457: Merge pull request #16577 from owncloud/enc_improve_migration

[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 474c99e19a73bcb3ce378c12f0629ee1eac059b5
Merge: e1483f6 0de59ac
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Thu May 28 11:31:33 2015 +0200

    Merge pull request #16577 from owncloud/enc_improve_migration
    
    only request encryption module for files which are not excluded

 lib/private/files/storage/wrapper/encryption.php | 114 ++++++++++++-----------
 settings/controller/encryptioncontroller.php     |   7 +-
 2 files changed, 63 insertions(+), 58 deletions(-)

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