merge-conflicts
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 25 Jun 2018 10:05:09 +0000 (12:05 +0200)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 25 Jun 2018 10:05:09 +0000 (12:05 +0200)
commitc90e813adcec89899d9db95843295a84fb058c3e
tree151e284873246f42f6cef81a874682d4b8da4233
parentae7d952a97542c2cfc12f6f41ab0de93af278919
parent5e88476747d9fb0c77ef76d63430192fa4b77f22
merge-conflicts

Feature ##13598

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