[Pkg-owncloud-commits] [owncloud] 60/457: Merge pull request #16085 from owncloud/encryption-module-rename

[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 d90b83725f87825a68b51a32228270d9e9a82ac6
Merge: 9e0cb44 35292eb
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Tue May 19 11:13:33 2015 +0200

    Merge pull request #16085 from owncloud/encryption-module-rename
    
    rename to 'Default encryption module'

 apps/encryption/appinfo/info.xml          | 2 +-
 apps/encryption/lib/crypto/encryption.php | 4 ++--
 lib/private/encryption/manager.php        | 2 +-
 lib/private/encryption/util.php           | 2 +-
 settings/templates/admin.php              | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)


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