]> git.arvados.org - arvados.git/commit
Merge branch 'master' into 2756-eventbus-in-workbench
authorradhika <radhika@curoverse.com>
Sat, 24 May 2014 19:49:06 +0000 (15:49 -0400)
committerradhika <radhika@curoverse.com>
Sat, 24 May 2014 19:49:06 +0000 (15:49 -0400)
commitf36fe36bd5e64b55b8699fae187c6accb678db2b
tree9bb5fa801b51e99c0021387d91d1c3b0492c9533
parent8e5db2221d848c35e751b932da8126b559d292f0
parent293b52241445edf9eb86e0a0f9b63fccc3aa7fbd
Merge branch 'master' into 2756-eventbus-in-workbench

Conflicts:
apps/workbench/app/assets/javascripts/pipeline_instances.js
apps/workbench/app/assets/javascripts/pipeline_instances.js
apps/workbench/app/views/pipeline_instances/_show_components.html.erb
apps/workbench/app/views/pipeline_instances/_show_components_editable.html.erb