[Pkg-owncloud-commits] [owncloud-doc] 27/28: Merge tag 'upstream/0_20141016'

[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 2e1b9245ccfdea6e0dbbde80897ae5f0fb1fae47
Merge: 1f6e49a a6c13a2
Author: David Prévot <taffit at debian.org>
Date:   Thu Oct 16 10:14:06 2014 -0400

    Merge tag 'upstream/0_20141016'
    
    Upstream version 0~20141016

 .../configuration/configuration-antivirus.rst      | 21 ++---
 .../configuration/configuration_file_sharing.rst   |  6 +-
 admin_manual/configuration/configuration_mail.rst  |  6 +-
 admin_manual/configuration/configuration_users.rst | 36 +++++---
 admin_manual/installation/configuration_nginx.rst  |  2 +-
 admin_manual/whats_new_admin.rst                   | 26 ++++--
 developer_manual/app/users.rst                     | 98 +++++++++++++++++++---
 user_manual/contents.rst                           |  2 +-
 user_manual/documents.rst                          |  3 +-
 user_manual/files/filesweb.rst                     | 12 +--
 10 files changed, 156 insertions(+), 56 deletions(-)

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