projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
92308b1
0dc881d
)
Merge branch 'main' from workbench2.git
author
Tom Clegg <tom@curii.com>
Thu, 5 Oct 2023 15:46:31 +0000
(11:46 -0400)
committer
Tom Clegg <tom@curii.com>
Thu, 5 Oct 2023 15:46:31 +0000
(11:46 -0400)
refs #18874
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
1
2
services/workbench2/package.json
patch
|
diff1
|
diff2
|
blob
|
history
services/workbench2/src/components/dropdown-menu/dropdown-menu.tsx
patch
|
diff1
|
diff2
|
blob
|
history
services/workbench2/src/views-components/baner/banner.tsx
patch
|
diff1
|
diff2
|
blob
|
history
services/workbench2/src/views-components/main-app-bar/notifications-menu.tsx
patch
|
diff1
|
diff2
|
blob
|
history
services/workbench2/yarn.lock
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/workbench2/package.json
Simple merge
diff --cc
services/workbench2/src/components/dropdown-menu/dropdown-menu.tsx
Simple merge
diff --cc
services/workbench2/src/views-components/baner/banner.tsx
Simple merge
diff --cc
services/workbench2/src/views-components/main-app-bar/notifications-menu.tsx
Simple merge
diff --cc
services/workbench2/yarn.lock
Simple merge