projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e287d16 921c13a)
Merge branch 'master' into 2244-sdk-docs
authorTom Clegg <tom@curoverse.com>
Tue, 25 Mar 2014 21:30:37 +0000 (17:30 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 25 Mar 2014 21:30:37 +0000 (17:30 -0400)
1  2 
doc/_config.yml patch | diff1 | diff2 | blob | history
doc/sdk/index.html.textile.liquid patch | diff1 | diff2 | blob | history

diff --cc doc/_config.yml
Simple merge
diff --cc doc/sdk/index.html.textile.liquid
Simple merge