merge-conflicts
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 18 Jun 2018 09:18:18 +0000 (11:18 +0200)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 18 Jun 2018 09:18:18 +0000 (11:18 +0200)
commitc16ef38920e9d011215a519bc58624a614717cd6
tree40b6c6508ccef741850afd51c8543d43ad1953ac
parenta78b68335f520c4a7d50362811369bf83a921296
parent0c793af552b746f9a9d3fef8005f6e23a3e1803e
merge-conflicts

Feature #13618

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
src/components/project-tree/project-tree.tsx
src/components/tree/tree.tsx
src/services/project-service/project-service.ts
src/views/workbench/workbench.tsx