fix merge conflicts
[arvados.git] / apps / workbench / app / views / getting_started / _getting_started_popup.html.erb
2015-04-10 Nancy Ouyangfix merge conflicts
2015-04-08 Radhika ChippadaMerge branch 'master' into 5493-getting-started-modal
2015-04-03 Radhika Chippada5493: minor refactoring