[Pkg-owncloud-commits] [owncloud-doc] 55/71: Merge pull request #1117 from RealRancor/backport_1025_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 1dd9bee3c28517c92e619d13f51b8ab9b4bbb932
Merge: 457d112 183a425
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Thu May 7 13:50:42 2015 +0200

    Merge pull request #1117 from RealRancor/backport_1025_stable7
    
    Backport #1025 to stable7

 user_manual/images/calendar_caldav_icon.png | Bin 0 -> 314 bytes
 user_manual/images/calendar_caldav_ios.png  | Bin 0 -> 18510 bytes
 user_manual/images/calendar_caldav_link.png | Bin 0 -> 9789 bytes
 user_manual/pim/calendar.rst                |  48 +++++++++++-----------------
 4 files changed, 18 insertions(+), 30 deletions(-)

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