projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6e0bff 5d3c855)
15003: Merge branch 'master' into 15003-preprocess-config
authorTom Clegg <tclegg@veritasgenetics.com>
Wed, 15 May 2019 13:57:36 +0000 (09:57 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Wed, 15 May 2019 13:57:36 +0000 (09:57 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

1  2 
services/api/config/arvados_config.rb patch | diff1 | diff2 | blob | history

diff --cc services/api/config/arvados_config.rb
Simple merge