merge-conflicts
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Fri, 13 Jul 2018 10:37:30 +0000 (12:37 +0200)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Fri, 13 Jul 2018 10:37:30 +0000 (12:37 +0200)
commitb323a94f313671b44a066a2f91dea562e9464d10
treef285c3f59344aa90248d751358b44cb2364d167e
parent5be1434f78d6dbcf2949918f7f042cab994ab0c5
parent18a8117437056f65e3c9d84b0231c5f64b1346d1
merge-conflicts

Feature #13796

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
src/views-components/main-app-bar/main-app-bar.test.tsx
src/views/project-panel/project-panel.tsx
src/views/workbench/workbench.tsx