[Pkg-owncloud-commits] [owncloud] 83/122: Merge pull request #16037 from owncloud/enc_dont_disable_encryption

[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 952a90f2e3ab60252b125b3e68193cc4995c0c54
Merge: 6783699 a1b9444
Author: Jan-Christoph Borchardt <hey at jancborchardt.net>
Date:   Tue May 5 18:53:01 2015 +0200

    Merge pull request #16037 from owncloud/enc_dont_disable_encryption
    
    don't let the the user disable encryption once it was activated

 core/css/styles.css          |  4 ++++
 settings/css/settings.css    |  4 ++++
 settings/js/admin.js         | 19 +++++++------------
 settings/templates/admin.php | 18 ++++++++++++++----
 4 files changed, 29 insertions(+), 16 deletions(-)

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