[Pkg-owncloud-commits] [owncloud] 168/215: Merge pull request #15919 from owncloud/enc_handle_empty_files

[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 4209757d61685346b9b3eb476035b4e86597ed64
Merge: 8955f38 29bcfb2
Author: Clark Tomlinson <fallen013 at gmail.com>
Date:   Wed Apr 29 19:32:02 2015 -0400

    Merge pull request #15919 from owncloud/enc_handle_empty_files
    
    Encryption improve handling of empty and unencrypted files

 apps/encryption/appinfo/application.php            |  3 +-
 apps/encryption/lib/crypto/crypt.php               |  2 +-
 apps/encryption/lib/crypto/encryption.php          | 74 ++++++++++++++--------
 .../encryption/tests/lib/crypto/encryptionTest.php | 73 +++++++++++++++++++--
 4 files changed, 118 insertions(+), 34 deletions(-)

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