[Pkg-owncloud-commits] [owncloud] 76/165: Merge pull request #15718 from owncloud/issue/15694-display-name-of-encryption-modules

[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 cdf82909b8225a885fbf92b78208fb1fe258853e
Merge: b7a4972 491e590
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Sat Apr 18 22:51:15 2015 +0200

    Merge pull request #15718 from owncloud/issue/15694-display-name-of-encryption-modules
    
    Issue/15694 display name of encryption modules

 apps/encryption_dummy/appinfo/app.php | 2 +-
 lib/private/encryption/manager.php    | 8 ++++----
 settings/admin.php                    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

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