[Pkg-owncloud-commits] [owncloud] 49/50: Merge pull request #11561 from owncloud/stable6-enc-webdavcopywithencryptionfix

[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 9327abd2e45101ac1c6f20693c47dcc066688d3c
Merge: af97529 07377be
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Wed Oct 15 12:30:37 2014 +0200

    Merge pull request #11561 from owncloud/stable6-enc-webdavcopywithencryptionfix
    
    [stable6] add support for webdav copy to the encryption and versions app

 apps/files_encryption/hooks/hooks.php | 47 ++++++++++++++++++-----
 apps/files_encryption/lib/helper.php  |  4 +-
 apps/files_encryption/tests/hooks.php | 52 ++++++++++++++++++++++++++
 apps/files_versions/appinfo/app.php   |  9 +----
 apps/files_versions/lib/hooks.php     | 32 +++++++++++++++-
 apps/files_versions/lib/versions.php  | 70 ++++++++++++++++++++++-------------
 6 files changed, 168 insertions(+), 46 deletions(-)

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