[Pkg-owncloud-commits] [owncloud-doc] 51/71: Merge pull request #1083 from RealRancor/backport_997_1079_stable7

[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 b7586812740c785a2ff9c36fc25c10f3a081f200
Merge: a4426a0 19dea18
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Sat Apr 25 16:06:14 2015 +0200

    Merge pull request #1083 from RealRancor/backport_997_1079_stable7
    
    Backport #997 and #1079 to stable7

 .../configuration/activity_configuration.rst       | 32 ++++++++++++++++++++++
 admin_manual/configuration/index.rst               |  1 +
 2 files changed, 33 insertions(+)

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