[Pkg-owncloud-commits] [owncloud-doc] 04/23: Merge pull request #1686 from RealRancor/backport_1682_stable7

[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-doc.

commit f46519d76a4926f0faec4c7b02df9be0a955bb2c
Merge: fc92726 a3ab4a2
Author: Carla Schroder <carla at owncloud.com>
Date:   Wed Sep 23 09:20:15 2015 -0700

    Merge pull request #1686 from RealRancor/backport_1682_stable7
    
    Backport #1682 to stable7

 admin_manual/configuration/config_sample_php_parameters.rst | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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