[Pkg-owncloud-commits] [owncloud-doc] 06/11: Merge pull request #2178 from owncloud/backport_2156_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 6851891eb7d46828abdf0315397452dcbffa51c1
Merge: ebda190 a110cbf
Author: Carla Schroder <carla at owncloud.com>
Date:   Mon Feb 22 08:41:04 2016 -0800

    Merge pull request #2178 from owncloud/backport_2156_stable7
    
    Backport #2156 to stable7

 admin_manual/installation/nginx_configuration.rst | 6 ++++++
 1 file changed, 6 insertions(+)

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