projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 720d44b 18258f6)
Merge remote-tracking branch 'origin/master' into 2061-update-docs
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 11 Feb 2014 19:00:57 +0000 (14:00 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 11 Feb 2014 19:00:57 +0000 (14:00 -0500)
1  2 
doc/_config.yml patch | diff1 | diff2 | blob | history

diff --cc doc/_config.yml
Simple merge