merge-conflicts
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Tue, 26 Jun 2018 11:12:55 +0000 (13:12 +0200)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Tue, 26 Jun 2018 11:12:55 +0000 (13:12 +0200)
commit78915a29d2911b1c442920b614f3e48da9e567c2
tree623b6dc1477621376322d28e7c4008da9da81bca
parent3eaf143e04107bf25e15aaef4d1b4d5d7ef68f86
parent4beb141298fce3da40f07e1a0a08f29ac28dfd09
merge-conflicts

Feature #13679

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