projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86b7903 cdc569e)
Merge branch '14715-keepprox-config'
authorEric Biagiotti <ebiagiotti@veritasgenetics.com>
Thu, 22 Aug 2019 15:50:53 +0000 (11:50 -0400)
committerEric Biagiotti <ebiagiotti@veritasgenetics.com>
Thu, 22 Aug 2019 15:50:53 +0000 (11:50 -0400)
refs #14715

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


Trivial merge