[Pkg-owncloud-commits] [owncloud] 06/16: Merge pull request #12528 from owncloud/backport-12419

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit d30059d76ce04a9b2a4bd91d0261977bb0c972ce
Merge: 5fe7781 f5d9513
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Wed Dec 3 17:48:25 2014 +0100

    Merge pull request #12528 from owncloud/backport-12419
    
    Allow read-only configuration

 config/config.sample.php     |  9 +++++++++
 lib/base.php                 |  6 +++---
 lib/private/helper.php       |  8 ++++++++
 settings/admin.php           |  2 ++
 settings/templates/admin.php | 20 +++++++++++++++++---
 5 files changed, 39 insertions(+), 6 deletions(-)


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