[Pkg-owncloud-commits] [owncloud] 23/79: Merge pull request #18064 from owncloud/import_root_certificates_8.1

[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 18ec257ab23b6254024afe092299018d66ad4be8
Merge: 04b409f 6534202
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Wed Aug 12 10:20:27 2015 +0200

    Merge pull request #18064 from owncloud/import_root_certificates_8.1
    
    [stable8.1] disable "ssl root certificate" settings if user can't mount external storages

 settings/application.php                           |  3 +-
 settings/controller/certificatecontroller.php      | 34 +++++++++++++++++++++-
 settings/personal.php                              | 18 +++++++++++-
 settings/templates/personal.php                    |  2 ++
 .../controller/CertificateControllerTest.php       | 25 +++++++++++-----
 5 files changed, 72 insertions(+), 10 deletions(-)

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