[Pkg-owncloud-commits] [owncloud] 33/122: Merge pull request #15584 from owncloud/enc_fix_upload_shared_folder

[David Prévot]

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit 7376ea9b269af6cd6355ed9bf386097121c10c77
Merge: 870ac88 4a6808a
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Mon May 4 09:57:19 2015 +0200

    Merge pull request #15584 from owncloud/enc_fix_upload_shared_folder
    
    skip user if we don't have a public key

 apps/encryption/appinfo/application.php            |  3 ++
 apps/encryption/lib/crypto/encryption.php          | 18 ++++++-
 apps/encryption/tests/lib/crypto/cryptTest.php     |  2 +-
 .../encryption/tests/lib/crypto/encryptionTest.php | 63 +++++++++++++++++++++-
 tests/lib/helper.php                               |  4 ++
 5 files changed, 87 insertions(+), 3 deletions(-)

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