projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d66aa15 a7c0781)
Merge branch 'master' into 14670-new-java-sdk-docs
authorPeter Amstutz <pamstutz@veritasgenetics.com>
Fri, 12 Apr 2019 14:56:24 +0000 (10:56 -0400)
committerPeter Amstutz <pamstutz@veritasgenetics.com>
Fri, 12 Apr 2019 14:56:24 +0000 (10:56 -0400)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

1  2 
build/run-tests.sh patch | diff1 | diff2 | blob | history
doc/_config.yml patch | diff1 | diff2 | blob | history

diff --cc build/run-tests.sh
Simple merge
diff --cc doc/_config.yml
Simple merge