Merge branch '1976-pipeline-progress'
authorTom Clegg <tom@curoverse.com>
Mon, 3 Feb 2014 22:56:30 +0000 (14:56 -0800)
committerTom Clegg <tom@curoverse.com>
Mon, 3 Feb 2014 22:56:30 +0000 (14:56 -0800)
commitd8c56aa6534d87105201372cd5f9f965a8246ea4
tree11fc8458e702b948957513659b1a8045019663b4
parent6038a018b758e1a4babc5669df50622cd470df2f
parent19552d4ecd7552ab5dfdfc6d894b22dce6b7f107
Merge branch '1976-pipeline-progress'

Conflicts:
apps/workbench/app/views/pipeline_instances/show.html.erb
apps/workbench/app/views/pipeline_instances/show.html.erb