[Pkg-owncloud-commits] [owncloud] 30/123: Merge pull request #16155 from owncloud/enc_admin_settings

[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 bcbf9a9bb577040ea760ed23d91ab9204b03943c
Merge: 16a0de6 4a450c9
Author: Björn Schießle <bjoern at schiessle.org>
Date:   Fri May 8 12:16:16 2015 +0200

    Merge pull request #16155 from owncloud/enc_admin_settings
    
    improved admin settings

 apps/encryption/css/settings-admin.css       | 23 ++++++++++
 apps/encryption/js/settings-admin.js         | 68 +++++++++++++++++-----------
 apps/encryption/templates/settings-admin.php | 62 +++++++++++--------------
 3 files changed, 90 insertions(+), 63 deletions(-)

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