projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f5a1a92
6de0a4a
)
4024: Merge branch 'master' into 4024-pipeline-instances-scroll
author
Tom Clegg <tom@curoverse.com>
Sun, 16 Nov 2014 02:18:47 +0000
(21:18 -0500)
committer
Tom Clegg <tom@curoverse.com>
Sun, 16 Nov 2014 02:18:47 +0000
(21:18 -0500)
1
2
apps/workbench/app/controllers/application_controller.rb
patch
|
diff1
|
diff2
|
blob
|
history
apps/workbench/test/integration/pipeline_instances_test.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
apps/workbench/app/controllers/application_controller.rb
Simple merge
diff --cc
apps/workbench/test/integration/pipeline_instances_test.rb
Simple merge
projects / arvados.git / commitdiff