[Pkg-owncloud-commits] [owncloud] 100/111: Merge pull request #5959 from owncloud/encryption_check_if_file_is_encrypted

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit c221e8272cacc198b963e9dd38463aa0f3d8897c
Merge: 30b8f4e b4e7258
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Wed Nov 20 07:32:43 2013 -0800

    Merge pull request #5959 from owncloud/encryption_check_if_file_is_encrypted
    
    only check if the key file exists to decide if it is an encrypted file or not

 apps/files_encryption/lib/keymanager.php |    3 +--
 apps/files_encryption/lib/stream.php     |    2 +-
 apps/files_encryption/lib/util.php       |   25 +++++++++++--------------
 apps/files_encryption/tests/crypt.php    |   14 +++++++-------
 4 files changed, 20 insertions(+), 24 deletions(-)

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