projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ef6f720 4ae3e06)
Merge branch '10234-git-httpd-config' refs #10234 refs #10263
authorTom Clegg <tom@curoverse.com>
Thu, 13 Oct 2016 20:43:55 +0000 (16:43 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 13 Oct 2016 20:43:55 +0000 (16:43 -0400)

Trivial merge