projects
/
arvados-workbench2.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e4db3c3
10959e3
)
Merge branch 'main' of git.arvados.org:arvados-workbench2 into 16073-process-io-panels
author
Stephen Smith <stephen@curii.com>
Fri, 21 Oct 2022 14:14:28 +0000
(10:14 -0400)
committer
Stephen Smith <stephen@curii.com>
Fri, 21 Oct 2022 14:14:28 +0000
(10:14 -0400)
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen@curii.com>
1
2
src/components/collection-panel-files/collection-panel-files.tsx
patch
|
diff1
|
diff2
|
blob
|
history
src/components/icon/icon.tsx
patch
|
diff1
|
diff2
|
blob
|
history
src/views-components/data-explorer/renderers.tsx
patch
|
diff1
|
diff2
|
blob
|
history
src/views-components/projects-tree-picker/generic-projects-tree-picker.tsx
patch
|
diff1
|
diff2
|
blob
|
history
yarn.lock
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/components/collection-panel-files/collection-panel-files.tsx
Simple merge
diff --cc
src/components/icon/icon.tsx
Simple merge
diff --cc
src/views-components/data-explorer/renderers.tsx
Simple merge
diff --cc
src/views-components/projects-tree-picker/generic-projects-tree-picker.tsx
Simple merge
diff --cc
yarn.lock
Simple merge