[Pkg-owncloud-commits] [owncloud-doc] 73/227: Merge pull request #498 from owncloud/alrac2

[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 79e4379fecf778961dfa6418df39abe07406580d
Merge: 8b3dfab e2f4658
Author: Daniel Molkentin <daniel at molkentin.de>
Date:   Fri Sep 5 19:55:00 2014 +0200

    Merge pull request #498 from owncloud/alrac2
    
    Mail configuration -- add smtp config wizard, editable email templates

 admin_manual/configuration/configuration_mail.rst | 287 +++++++++++++++-------
 admin_manual/images/smtp-config-php-sendmail.png  | Bin 0 -> 13106 bytes
 admin_manual/images/smtp-config-smtp.png          | Bin 0 -> 23999 bytes
 admin_manual/images/smtp-config-wizard.png        | Bin 0 -> 23571 bytes
 4 files changed, 193 insertions(+), 94 deletions(-)

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