Merge branch 'acme-nginx'
authorToke Høiland-Jørgensen <toke@toke.dk>
Wed, 19 Sep 2018 14:30:35 +0000 (16:30 +0200)
committerToke Høiland-Jørgensen <toke@toke.dk>
Wed, 19 Sep 2018 14:30:42 +0000 (16:30 +0200)
commitef48e2cb94e3b8f3939b96e782f0c4c4771875e7
tree6379428369cc5e961fb29aef888e34b1c80620a8
parentd344c56f9ef99e5f70fe838c23b0347041b0d30a
parenta96c90b6f56ba0c181612fc4e4a9422c27d5a06f
Merge branch 'acme-nginx'

Closes #6513

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>