[Pkg-owncloud-commits] [owncloud-doc] 103/227: Merge pull request #560 from owncloud/rework_user

[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 51666b49c3795c022142ecc7b79ddabdcaaaa655
Merge: 4f80310 d1fb38e
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Tue Sep 16 08:58:20 2014 +0200

    Merge pull request #560 from owncloud/rework_user
    
    rework_user manual and include #369

 user_manual/files/sync.rst           |  2 +-
 user_manual/files/versioncontrol.rst |  4 ++--
 user_manual/pim/calendar.rst         |  2 +-
 user_manual/pim/contacts.rst         |  2 +-
 user_manual/pim/sync_ios.rst         |  6 +++---
 user_manual/pim/sync_thunderbird.rst | 14 +++++++++++---
 user_manual/pim/troubleshooting.rst  |  4 ++--
 7 files changed, 21 insertions(+), 13 deletions(-)


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