[Pkg-owncloud-commits] [owncloud-doc] 21/23: Merge remote-tracking branch 'upstream/stable7' into upstream

[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 6499022e2962099dd9f6a28f3dbd1092ad5f555a
Merge: e002742 1320768
Author: David Prévot <david at tilapin.org>
Date:   Thu Oct 22 11:19:38 2015 -0400

    Merge remote-tracking branch 'upstream/stable7' into upstream

 README.rst                                         |  2 +-
 .../big_file_upload_configuration.rst              |  2 +-
 .../configuration/config_sample_php_parameters.rst | 13 ++-
 admin_manual/configuration/user_configuration.rst  |  3 +-
 admin_manual/installation/installation_wizard.rst  |  7 +-
 admin_manual/installation/nginx_configuration.rst  | 93 ++++++++++++++-------
 admin_manual/installation/source_installation.rst  | 96 +++++++++++++++++++---
 admin_manual/issues/index.rst                      |  6 ++
 user_manual/files/files.rst                        | 62 ++++++++++++++
 9 files changed, 233 insertions(+), 51 deletions(-)

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