13650: Merge branch 'master' into 13650-document-arvados-kubernetes
authorWard Vandewege <wvandewege@veritasgenetics.com>
Mon, 25 Jun 2018 19:10:32 +0000 (15:10 -0400)
committerWard Vandewege <wvandewege@veritasgenetics.com>
Mon, 25 Jun 2018 19:10:55 +0000 (15:10 -0400)
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege@veritasgenetics.com>

1  2 
doc/_config.yml

diff --cc doc/_config.yml
Simple merge