[Pkg-owncloud-commits] [owncloud] 63/85: Merge pull request #8988 from owncloud/stable6_fix_encryption

[David Prévot]

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

taffit pushed a commit to branch 6.0
in repository owncloud.

commit bca536eb3d0bdf536bd56ac50ada31a5e1867157
Merge: 6453454 193d237
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Fri Jun 13 10:31:18 2014 +0200

    Merge pull request #8988 from owncloud/stable6_fix_encryption
    
    Stable6 fix encryption

 apps/files_encryption/hooks/hooks.php |  4 ++--
 apps/files_encryption/tests/hooks.php | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

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