[Pkg-owncloud-commits] [owncloud] 30/239: Merge branch 'encryption_work_with_public_gallery' into 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 009bbef17e8636e432f070839a25f99a7780e153
Merge: 18c80e4 16b4842
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Thu Nov 21 10:34:25 2013 +0100

    Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload

 apps/files_encryption/lib/keymanager.php    |  1 +
 apps/files_encryption/lib/proxy.php         |  3 +++
 apps/files_encryption/lib/stream.php        |  3 ++-
 apps/files_encryption/lib/util.php          | 21 +++++++++------------
 apps/files_external/lib/sftp.php            | 14 ++++++++------
 apps/files_external/lib/webdav.php          |  4 ++--
 lib/private/connector/sabre/filesplugin.php |  2 ++
 lib/private/files/storage/common.php        | 26 ++++++--------------------
 lib/private/files/storage/commontest.php    |  2 +-
 lib/private/files/storage/local.php         |  8 --------
 lib/private/files/storage/mappedlocal.php   |  8 --------
 version.php                                 |  4 ++--
 12 files changed, 36 insertions(+), 60 deletions(-)


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