Merge branch 'master' into 14345-add-webdav-user-doc
authorWard Vandewege <wvandewege@veritasgenetics.com>
Wed, 28 Nov 2018 18:29:43 +0000 (13:29 -0500)
committerWard Vandewege <wvandewege@veritasgenetics.com>
Wed, 28 Nov 2018 18:31:11 +0000 (13:31 -0500)
refs #14345

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege@veritasgenetics.com>

1  2 
doc/_config.yml

diff --cc doc/_config.yml
Simple merge