[Pkg-owncloud-commits] [owncloud-doc] 161/270: Merge pull request #372 from owncloud/admin-guide-trusted_domains

[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 d42d62567ffd7dfc75275cb1ed96cb92d63b4451
Merge: 3464678 5d0c8ce
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Fri Jun 6 09:57:30 2014 +0200

    Merge pull request #372 from owncloud/admin-guide-trusted_domains
    
    Admin guide: clarify trusted_domains

 admin_manual/installation/images/untrusted-domain.png | Bin 0 -> 26983 bytes
 admin_manual/installation/installation_wizard.rst     |  12 ++++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

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