projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b4fd2ab 2717e70)
Merge branch 'master' into 4904-arv-web
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 29 Jan 2015 15:08:31 +0000 (10:08 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 29 Jan 2015 15:08:31 +0000 (10:08 -0500)
1  2 
doc/_config.yml patch | diff1 | diff2 | blob | history
sdk/python/arvados/events.py patch | diff1 | diff2 | blob | history

diff --cc doc/_config.yml
Simple merge
diff --cc sdk/python/arvados/events.py
Simple merge