[Pkg-owncloud-commits] [owncloud] 32/118: Merge pull request #14632 from owncloud/backport/14593

[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 f59b286a597764760fd32c8afe60c0dbe9b02fdf
Merge: 7e87cda 266a655
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Wed Mar 11 16:18:26 2015 +0100

    Merge pull request #14632 from owncloud/backport/14593
    
    Backport/14593

 lib/base.php                 | 17 ++++++++++++++++-
 settings/admin.php           |  1 +
 settings/templates/admin.php | 22 ++++++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)

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