[Pkg-owncloud-commits] [owncloud] 09/70: Merge pull request #9173 from owncloud/enc_always_use_oc_filesview_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.5RC1
in repository owncloud.

commit e14e4f1dc42cb42055bd0d10a13b3da0ede3b6cb
Merge: 28eabc1 46cc6f5
Author: Björn Schießle <schiessle at owncloud.com>
Date:   Thu Jun 26 15:11:55 2014 +0200

    Merge pull request #9173 from owncloud/enc_always_use_oc_filesview_oc6
    
    [encryption] always use oc filesview, backport for OC6

 apps/files_encryption/hooks/hooks.php      | 20 ++++-----
 apps/files_encryption/lib/helper.php       | 26 +++++++++---
 apps/files_encryption/lib/keymanager.php   | 46 +++++++++++----------
 apps/files_encryption/tests/hooks.php      |  2 +-
 apps/files_encryption/tests/keymanager.php | 65 +++++++++++++++---------------
 5 files changed, 89 insertions(+), 70 deletions(-)


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