[Pkg-owncloud-commits] [owncloud] 39/70: Merge pull request #9717 from owncloud/backport_9668

[David Prévot]

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

taffit pushed a commit to annotated tag v6.0.5RC1
in repository owncloud.

commit a47aad86281ee3cab80855f597674ce5815eac05
Merge: 3e2e766 51185c1
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Fri Jul 18 15:03:17 2014 +0200

    Merge pull request #9717 from owncloud/backport_9668
    
    [encryption] update keys recursively if a folder was moved (oc6 backport)

 apps/files_encryption/hooks/hooks.php | 62 +++++++++++++++++++++--------------
 apps/files_encryption/lib/util.php    |  4 +++
 apps/files_encryption/tests/crypt.php |  9 ++---
 apps/files_encryption/tests/share.php | 53 +++++++++++++++++++++++++++++-
 4 files changed, 98 insertions(+), 30 deletions(-)

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