[Pkg-owncloud-commits] [owncloud-doc] 22/71: Merge pull request #998 from RealRancor/backport_996_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 b8db01ae7ae047dae61f57029d333e26bb22a3a0
Merge: 163ae18 d0e5b52
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Mon Mar 30 10:00:17 2015 +0200

    Merge pull request #998 from RealRancor/backport_996_stable7
    
    Backport of #996 and #995 to stable7

 admin_manual/configuration/background_jobs_configuration.rst | 4 ++++
 admin_manual/configuration/big_file_upload_configuration.rst | 3 +++
 2 files changed, 7 insertions(+)

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