[Pkg-owncloud-commits] [owncloud] 29/457: Merge pull request #16404 from owncloud/enc_encrypt_files_in_trash

[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 86cf8e1f689db6e6781c78eae9a057c7d9548c0a
Merge: 85f500f 7d492fe
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Mon May 18 14:59:34 2015 +0200

    Merge pull request #16404 from owncloud/enc_encrypt_files_in_trash
    
    also encrypt files in trash bin

 apps/encryption/lib/crypto/encryption.php          |  5 ++++-
 .../encryption/tests/lib/crypto/encryptionTest.php | 25 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)


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