[Pkg-owncloud-commits] [owncloud-doc] 11/23: Merge pull request #1762 from RealRancor/backport_1757_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 5b2b413670f36d0d288b93da85876275b4c3d11b
Merge: 72f7d66 3fa2156
Author: Carla Schroder <carla at owncloud.com>
Date:   Wed Oct 7 15:22:24 2015 -0700

    Merge pull request #1762 from RealRancor/backport_1757_stable7
    
    Backport #1757 to stable7

 admin_manual/installation/nginx_configuration.rst | 93 +++++++++++++++--------
 1 file changed, 62 insertions(+), 31 deletions(-)

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