[Pkg-owncloud-commits] [owncloud] 206/239: Merge pull request #5977 from owncloud/encryption_enable_public_upload

[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 40231c08cf617b5909dee778372d6b1b8cdd5bcf
Merge: 5b7b053 9fb71af
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Wed Nov 27 07:39:03 2013 -0800

    Merge pull request #5977 from owncloud/encryption_enable_public_upload
    
    Encryption enable public upload

 apps/files/index.php                       |  1 -
 apps/files_encryption/lib/helper.php       |  1 +
 apps/files_encryption/lib/keymanager.php   | 14 +++++---------
 apps/files_encryption/lib/proxy.php        |  7 +++----
 apps/files_encryption/lib/stream.php       |  5 +++--
 apps/files_encryption/lib/util.php         |  4 ++--
 apps/files_encryption/tests/keymanager.php |  4 +++-
 apps/files_sharing/public.php              |  3 ---
 8 files changed, 17 insertions(+), 22 deletions(-)

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