projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2099a0a
140944b
)
2754: Merge branch '2754-easy-run-pipeline' refs #2754
author
Tom Clegg <tom@curoverse.com>
Fri, 23 May 2014 17:17:44 +0000
(13:17 -0400)
committer
Tom Clegg <tom@curoverse.com>
Fri, 23 May 2014 17:17:44 +0000
(13:17 -0400)
1
2
apps/workbench/app/helpers/application_helper.rb
patch
|
diff1
|
diff2
|
blob
|
history
apps/workbench/test/integration_helper.rb
patch
|
diff1
|
diff2
|
blob
|
history
services/api/test/fixtures/collections.yml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
apps/workbench/app/helpers/application_helper.rb
Simple merge
diff --cc
apps/workbench/test/integration_helper.rb
Simple merge
diff --cc
services/api/test/fixtures/collections.yml
Simple merge
projects / arvados.git / commitdiff