[Pkg-owncloud-commits] [owncloud] 46/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 6443e570c2793954309f9541cd6a7a8c309644ac
Merge: 87f2696 d2e6f7d
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Thu Nov 21 16:00:21 2013 +0100

    Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload

 apps/files_encryption/lib/helper.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

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