[Pkg-owncloud-commits] [owncloud] 60/273: Merge pull request #9171 from owncloud/enc_always_use_oc_view

[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 aabee3e4b0a870a25f07ed0b80c76a5f0d3d0de4
Merge: 1822bba d3d1955
Author: Björn Schießle <schiessle at owncloud.com>
Date:   Thu Jun 26 15:11:08 2014 +0200

    Merge pull request #9171 from owncloud/enc_always_use_oc_view
    
    [encryption] always use oc view

 apps/files_encryption/hooks/hooks.php      | 51 ++++++++--------------
 apps/files_encryption/lib/helper.php       | 26 ++++++++---
 apps/files_encryption/lib/keymanager.php   | 59 +++++++++++--------------
 apps/files_encryption/tests/hooks.php      |  2 +-
 apps/files_encryption/tests/keymanager.php | 69 +++++++++++++++---------------
 5 files changed, 98 insertions(+), 109 deletions(-)

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