projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd8bdd9 8a41cc4)
Merge branch '15964-fix-docs' refs #15964
authorPeter Amstutz <peter.amstutz@curii.com>
Tue, 25 Aug 2020 18:45:29 +0000 (14:45 -0400)
committerPeter Amstutz <peter.amstutz@curii.com>
Tue, 25 Aug 2020 18:45:29 +0000 (14:45 -0400)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

1  2 
build/run-tests.sh patch | diff1 | diff2 | blob | history
doc/_config.yml patch | diff1 | diff2 | blob | history
doc/sdk/python/cookbook.html.textile.liquid patch | diff1 | diff2 | blob | history
lib/config/config.default.yml patch | diff1 | diff2 | blob | history
lib/config/generated_config.go patch | diff1 | diff2 | blob | history

diff --cc build/run-tests.sh
Simple merge
diff --cc doc/_config.yml
Simple merge
diff --cc lib/config/config.default.yml
Simple merge
diff --cc lib/config/generated_config.go
Simple merge