[Pkg-owncloud-commits] [owncloud-doc] 08/11: 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 825e1c56f4175e2fa22e25e7df586b080a9bed0b
Merge: 09c9f56 47120a8
Author: David Prévot <david at tilapin.org>
Date:   Fri Mar 4 21:23:15 2016 -0400

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

 .directory                                                     | 10 ++++++++++
 README.rst                                                     |  3 ++-
 admin_manual/.directory                                        | 10 ++++++++++
 admin_manual/configuration/external_storage_configuration.rst  |  2 +-
 .../configuration/serving_static_files_configuration.rst       |  4 ++--
 admin_manual/configuration_files/.directory                    |  7 +++++++
 admin_manual/enterprise_clients/.directory                     |  7 +++++++
 admin_manual/enterprise_external_storage/.directory            |  7 +++++++
 admin_manual/installation/.directory                           |  7 +++++++
 admin_manual/installation/appliance_installation.rst           |  3 +++
 admin_manual/installation/nginx_configuration.rst              |  8 +++++++-
 admin_manual/installation/source_installation.rst              |  6 +++---
 admin_manual/installation/yaws_configuration.rst               |  2 +-
 user_manual/pim/contacts.rst                                   |  2 +-
 user_manual/pim/sync_thunderbird.rst                           |  2 +-
 user_manual/pim/troubleshooting.rst                            |  3 ++-
 16 files changed, 71 insertions(+), 12 deletions(-)

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