fix merge conflicts
authorNancy Ouyang <nancy.ouyang@gmail.com>
Fri, 10 Apr 2015 17:32:42 +0000 (13:32 -0400)
committerNancy Ouyang <nancy.ouyang@gmail.com>
Fri, 10 Apr 2015 17:32:42 +0000 (13:32 -0400)
commit6dffa00d8e284e3e5266b9d318cd6c732ae905f4
tree014bdab6ec4884dd3947baba3a3df918f8249d4e
parent8e4ed0edeadc4dfcc85666ef5c36619815dca8e2
fix merge conflicts
apps/workbench/app/assets/images/mouse-move.gif [new file with mode: 0644]
apps/workbench/app/assets/images/pipeline-running.gif [new file with mode: 0644]
apps/workbench/app/views/getting_started/_getting_started_popup.html.erb