projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6dffa00 dcd96ef)
Merge branch '5493-getting-started-modal' of git.curoverse.com:arvados into 5493...
authorNancy Ouyang <nancy.ouyang@gmail.com>
Fri, 10 Apr 2015 17:33:47 +0000 (13:33 -0400)
committerNancy Ouyang <nancy.ouyang@gmail.com>
Fri, 10 Apr 2015 17:33:47 +0000 (13:33 -0400)
Conflicts:
apps/workbench/app/views/getting_started/_getting_started_popup.html.erb


Trivial merge