Merge branch 'master' into 1977-provenance-report
authorTom Clegg <tom@curoverse.com>
Mon, 3 Feb 2014 22:44:19 +0000 (14:44 -0800)
committerTom Clegg <tom@curoverse.com>
Mon, 3 Feb 2014 22:44:19 +0000 (14:44 -0800)
commit6038a018b758e1a4babc5669df50622cd470df2f
tree38527ce2ad1b5f4a153b5a9fb75ee76b5114011d
parent5a016cb9182b979b94df49c8b20856853541396e
parentbfa69a748122aa2515c85052c8e38752d290ecc1
Merge branch 'master' into 1977-provenance-report

Conflicts:
apps/workbench/app/controllers/pipeline_instances_controller.rb
apps/workbench/app/views/jobs/show.html.erb
apps/workbench/app/controllers/pipeline_instances_controller.rb
apps/workbench/app/views/jobs/index.html.erb
apps/workbench/app/views/jobs/show.html.erb
apps/workbench/app/views/pipeline_instances/show.html.erb