merge conflicts
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Tue, 21 Aug 2018 10:59:45 +0000 (12:59 +0200)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Tue, 21 Aug 2018 10:59:45 +0000 (12:59 +0200)
commitb12a180cf035192be3e22dfa5a2200d4969ce51a
tree8b6f3060d4ff1e07bdda1152aa8e0a4a901f1e24
parentad819c323f1623d357398e3b1344e0a8f1d38366
parent9f472b932176e09be950115feab148da3be5c321
merge conflicts

Feature #13988

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts