projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a86762d
d885673
)
Merge branch 'master' into 4232-slow-pipes-n-jobs
author
Phil Hodgson <bitbucket@philhodgson.net>
Sat, 21 Feb 2015 09:11:43 +0000
(10:11 +0100)
committer
Phil Hodgson <bitbucket@philhodgson.net>
Sat, 21 Feb 2015 09:11:43 +0000
(10:11 +0100)
1
2
apps/workbench/app/views/application/_title_and_buttons.html.erb
patch
|
diff1
|
diff2
|
blob
|
history
apps/workbench/app/views/pipeline_instances/_running_component.html.erb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
apps/workbench/app/views/application/_title_and_buttons.html.erb
Simple merge
diff --cc
apps/workbench/app/views/pipeline_instances/_running_component.html.erb
Simple merge