projects
/
arvados-workbench2.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bde866a
4b8cc1a
)
Merge branch 'master' into 14129-inputs-modal-new
author
Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Thu, 8 Nov 2018 13:35:02 +0000
(14:35 +0100)
committer
Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Thu, 8 Nov 2018 13:35:02 +0000
(14:35 +0100)
refs #14129
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
1
2
src/views-components/context-menu/action-sets/process-action-set.ts
patch
|
diff1
|
diff2
|
blob
|
history
src/views/process-panel/process-information-card.tsx
patch
|
diff1
|
diff2
|
blob
|
history
src/views/workbench/workbench.tsx
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/views-components/context-menu/action-sets/process-action-set.ts
Simple merge
diff --cc
src/views/process-panel/process-information-card.tsx
Simple merge
diff --cc
src/views/workbench/workbench.tsx
Simple merge