16306: Merge branch 'master'
authorTom Clegg <tom@tomclegg.ca>
Fri, 21 Aug 2020 18:51:32 +0000 (14:51 -0400)
committerTom Clegg <tom@tomclegg.ca>
Fri, 21 Aug 2020 18:51:32 +0000 (14:51 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>

1  2 
build/run-tests.sh
doc/_config.yml

Simple merge
diff --cc doc/_config.yml
Simple merge