[Pkg-owncloud-commits] [owncloud-doc] 29/71: Merge pull request #1022 from RealRancor/backport_1011_1002_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 a8f90c76bc646119f469be3ad9dcd66249041739
Merge: 730a695 3944ace
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Fri Apr 3 19:45:35 2015 +0200

    Merge pull request #1022 from RealRancor/backport_1011_1002_stable7
    
    Backport #1011 and #1002 to stable7

 .../configuration/external_storage_configuration.rst    | 17 +++++++++++++++++
 .../external_storage_configuration_gui.rst              | 17 +++++++++++++++++
 user_manual/pim/calendar.rst                            |  8 ++++++--
 3 files changed, 40 insertions(+), 2 deletions(-)

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