[Pkg-owncloud-commits] [owncloud-doc] 05/38: Merge pull request #602 from owncloud/config-sample-preparation

[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 e76c2327111d62dc7f7d4f6604645631da0b19ab
Merge: c0fceef 84d45df
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Thu Oct 16 10:51:28 2014 +0200

    Merge pull request #602 from owncloud/config-sample-preparation
    
    Config sample preparation

 .../configuration_config_sample_php.rst            | 903 +++++++++++++++++++++
 admin_manual/configuration/index.rst               |   1 +
 admin_manual/index.rst                             |   1 +
 3 files changed, 905 insertions(+)

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