merge conficts
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Tue, 10 Jul 2018 10:40:40 +0000 (12:40 +0200)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Tue, 10 Jul 2018 10:40:40 +0000 (12:40 +0200)
commitba1958858cbb152de49946cf7c1c8ce923eb628a
tree27e97c34370f030fb51ae228bca2d2dc9c28d6d5
parent3429b49bb9ff70db11f3239c7fbbc03ac7c2e460
parent5114536622bd9abf5bd729629b9249ccd11fd3ce
merge conficts

Feature #13694

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
src/views-components/create-project-dialog/create-project-dialog.tsx
src/views-components/dialog-create/dialog-project-create.tsx
src/views/project-panel/project-panel.tsx