merge conflicts
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Tue, 2 Oct 2018 13:18:52 +0000 (15:18 +0200)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Tue, 2 Oct 2018 13:18:52 +0000 (15:18 +0200)
commit019459c71713b979cb4cc34ec3a91a947d2c235a
tree3282a7d92280456c7e977a436364bba2c50935a5
parent3b5006ca69bbb5c6f446adfcdd6eeb3a5508f84a
parente79b7364ea28b6f0719c9adf409ba1217b9ccac8
merge conflicts

Feature #14231

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