From: Eric Biagiotti <ebiagiotti@veritasgenetics.com>
Date: Tue, 27 Aug 2019 16:01:03 +0000 (-0400)
Subject: Merge branch '14712-git-httpd-config'
X-Git-Tag: 2.0.0~214
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/5bbec701f90b8179d66e5c308c1c01e3c4dcade7

Merge branch '14712-git-httpd-config'

refs #14712

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>
---

5bbec701f90b8179d66e5c308c1c01e3c4dcade7