[Pkg-owncloud-commits] [owncloud] 32/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 87f2696e6a1f8e992a2019212e6cc08c137cc90f
Merge: 009bbef c7dc6dc
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Thu Nov 21 11:18:53 2013 +0100

    Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload

 apps/files_encryption/lib/util.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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