projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eaa436d 9fd9676)
Merge branch 'master' into 1978-compare-pipelines
authorTom Clegg <tom@curoverse.com>
Sat, 1 Feb 2014 23:34:44 +0000 (15:34 -0800)
committerTom Clegg <tom@curoverse.com>
Sat, 1 Feb 2014 23:34:44 +0000 (15:34 -0800)
Conflicts:
apps/workbench/app/controllers/pipeline_instances_controller.rb
apps/workbench/app/views/pipeline_instances/compare.html.erb


Trivial merge