Merge pull request #7482 from sotux/master
authorTed Hess <thess@kitschensync.net>
Wed, 12 Dec 2018 01:16:55 +0000 (20:16 -0500)
committerGitHub <noreply@github.com>
Wed, 12 Dec 2018 01:16:55 +0000 (20:16 -0500)
nginx: unified indentation character and add additional configure directory


Trivial merge