[Pkg-owncloud-commits] [owncloud-doc] 09/11: Merge tag 'upstream/0_20160302'

[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 21623346efd7f73521661ff24ec281376a2b35d1
Merge: 93ff9f2 825e1c5
Author: David Prévot <david at tilapin.org>
Date:   Fri Mar 4 21:43:06 2016 -0400

    Merge tag 'upstream/0_20160302'
    
    Upstream version 0~20160302

 .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