[Pkg-owncloud-commits] [owncloud] 111/122: Merge pull request #16034 from owncloud/issue-15987-encryption-module-admin-page

[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 12b24ee567349faa7991b0a86d45e42b67daf43e
Merge: 3dee907 eadc2c3
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Thu May 7 10:44:03 2015 +0200

    Merge pull request #16034 from owncloud/issue-15987-encryption-module-admin-page
    
    Display the module settings in the list of the encryption modules

 apps/encryption/js/settings-personal.js         |  6 +++---
 apps/encryption/templates/settings-admin.php    |  4 +---
 apps/encryption/templates/settings-personal.php |  2 +-
 core/css/apps.css                               |  6 ++++++
 settings/admin.php                              | 10 ++++++++--
 settings/templates/admin.php                    |  2 ++
 6 files changed, 21 insertions(+), 9 deletions(-)


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