[Pkg-owncloud-commits] [owncloud] 29/50: Merge pull request #11207 from owncloud/enc_create_backup_on_recovery_oc6

[David Prévot]

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

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

commit e123b6db6858af3bf1dafce494cf7d48eb6f7011
Merge: 7a2dbc2 7539309
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Mon Sep 22 15:11:16 2014 +0200

    Merge pull request #11207 from owncloud/enc_create_backup_on_recovery_oc6
    
    create backup from all keys before recovery (oc6 backport)

 apps/files_encryption/hooks/hooks.php |  3 +++
 apps/files_encryption/lib/util.php    | 44 ++++++++++++++++++++++++++++++
 apps/files_encryption/tests/util.php  | 50 +++++++++++++++++++++++++++++++++++
 3 files changed, 97 insertions(+)

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