merge conflict
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 3 Sep 2018 09:45:58 +0000 (11:45 +0200)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 3 Sep 2018 09:45:58 +0000 (11:45 +0200)
commitfc3d9ac09fbb1cdc4fb4b00f2f704795ad365110
tree6a17319fb3063ebe2ffb3b51d0a3f9e13e0bb6c6
parentaca52d4ea87faf5063db188998edfee1dea4e002
parent80c74e54f7f176e9809a049b241a90765699713f
merge conflict

Feature #13859

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