[Pkg-owncloud-commits] [owncloud] 151/273: Merge pull request #9240 from owncloud/enc_check_if_file_exists

[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 f3973c1c205893e9260b3684a20acc0ec0a9ae13
Merge: 07ba944 618c9fd
Author: Björn Schießle <schiessle at owncloud.com>
Date:   Mon Jun 30 21:23:59 2014 +0200

    Merge pull request #9240 from owncloud/enc_check_if_file_exists
    
    [encryption] check if file still exists before removing encryption keys

 apps/files_encryption/lib/keymanager.php   |  64 ++++++---
 apps/files_encryption/tests/keymanager.php | 211 ++++++++++++++++++++++++++---
 2 files changed, 237 insertions(+), 38 deletions(-)

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