Merge pull request #11081 from peter-stadler/nginx
authorRosen Penev <rosenp@gmail.com>
Mon, 3 Feb 2020 22:08:40 +0000 (14:08 -0800)
committerGitHub <noreply@github.com>
Mon, 3 Feb 2020 22:08:40 +0000 (14:08 -0800)
nginx: use /etc/nginx/nginx.conf enabling conf.d/


Trivial merge