projects
/
arvados-workbench2.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
42f46bf
9c73ce8
)
Merge branch 'master' into 14015-rename-a-file
author
Michal Klobukowski <michal.klobukowski@contractors.roche.com>
Mon, 20 Aug 2018 12:03:21 +0000
(14:03 +0200)
committer
Michal Klobukowski <michal.klobukowski@contractors.roche.com>
Mon, 20 Aug 2018 12:03:21 +0000
(14:03 +0200)
refs #14015
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
1
2
src/services/collection-service/collection-service.ts
patch
|
diff1
|
diff2
|
blob
|
history
src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/services/collection-service/collection-service.ts
Simple merge
diff --cc
src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts
Simple merge