Merge branch 'master' into 3901-component-rendering-errors
authorTim Pierce <twp@curoverse.com>
Fri, 26 Sep 2014 19:42:12 +0000 (15:42 -0400)
committerTim Pierce <twp@curoverse.com>
Fri, 26 Sep 2014 19:42:12 +0000 (15:42 -0400)
commit029656d8b2646bae51de03426a6496cbce0cc9d7
tree0769f05f07a30a8186e977960a79c3a254794743
parentc02331eb9e7d302efdd788af0dd3ba9124352edb
parent0fc69ec920fb2edf48a196adfbce1e7c66218f04
Merge branch 'master' into 3901-component-rendering-errors

Conflicts:
apps/workbench/app/helpers/pipeline_instances_helper.rb
apps/workbench/app/helpers/pipeline_instances_helper.rb
apps/workbench/app/views/pipeline_instances/_running_component.html.erb