[Pkg-owncloud-commits] [owncloud] 09/165: Merge pull request #15670 from owncloud/encryption-is-an-shipped-app-master

[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 99b0c6e525e71de18245ba434852389349b4f2d7
Merge: 2e06cf4 b6f7956
Author: Joas Schilling <nickvergessen at gmx.de>
Date:   Thu Apr 16 11:57:14 2015 +0200

    Merge pull request #15670 from owncloud/encryption-is-an-shipped-app-master
    
    files_encryption -> encryption

 core/shipped.json | 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