git.arvados.org - arvados.git/commitdiff

author	Lucas Di Pentima <ldipentima@veritasgenetics.com>
	Wed, 27 Jun 2018 17:48:14 +0000 (14:48 -0300)
committer	Lucas Di Pentima <ldipentima@veritasgenetics.com>
	Wed, 27 Jun 2018 17:48:14 +0000 (14:48 -0300)

Refs #13649

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>

		1	2
doc/_config.yml	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge