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)
commit645b161de03001fee5663397f033a2efb17bda98
tree014bdab6ec4884dd3947baba3a3df918f8249d4e
parent6dffa00d8e284e3e5266b9d318cd6c732ae905f4
parentdcd96ef83d878c48e588a815d7793e6004c4f08c
Merge branch '5493-getting-started-modal' of git.curoverse.com:arvados into 5493-getting-started-modal

Conflicts:
apps/workbench/app/views/getting_started/_getting_started_popup.html.erb