[Pkg-owncloud-commits] [owncloud-doc] 227/270: Merge pull request #426 from owncloud/calendar.rst-changes

[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 6ca19be8cd40963336b77a495600c28cfe3a227f
Merge: 1b02752 91bec6d
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Wed Jul 16 13:44:17 2014 +0200

    Merge pull request #426 from owncloud/calendar.rst-changes
    
    Calendar.rst changes

 .gitignore                                         |   3 +-
 user_manual/images/Thumbs.db                       | Bin 948736 -> 0 bytes
 user_manual/images/calendar_create_event.png       | Bin 0 -> 10393 bytes
 .../images/calendar_create_event_advanced.png      | Bin 0 -> 12664 bytes
 .../images/calendar_create_event_repeat.png        | Bin 0 -> 5671 bytes
 .../calendar_create_event_repeat_advanced.png      | Bin 0 -> 9287 bytes
 user_manual/images/calendar_create_event_share.png | Bin 0 -> 11036 bytes
 user_manual/images/calendar_create_new.png         | Bin 0 -> 8572 bytes
 user_manual/images/calendar_default.png            | Bin 0 -> 67569 bytes
 user_manual/images/calendar_edit_event.png         | Bin 0 -> 8846 bytes
 user_manual/images/calendar_settings.png           | Bin 0 -> 15142 bytes
 user_manual/pim/calendar.rst                       | 315 +++++++++++++++++----
 12 files changed, 260 insertions(+), 58 deletions(-)

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