refs #13632 Merge branch '13632-collections-service'
authorDaniel Kos <daniel.kos@contractors.roche.com>
Wed, 20 Jun 2018 06:09:00 +0000 (08:09 +0200)
committerDaniel Kos <daniel.kos@contractors.roche.com>
Wed, 20 Jun 2018 06:09:00 +0000 (08:09 +0200)
commite5b901f7d6f87b56f43d3dbe002c9c90a3d41349
treec376ef22805b77926078b41aef61ba06475486f8
parent8dc6f80d8dc2365248093ae7c402491d4614d7f4
parent4a5d370214feccdab2a9d3cf398471daa695d401
refs #13632 Merge branch '13632-collections-service'

# Conflicts:
# src/components/data-table/data-table.tsx
# src/views-components/data-explorer/data-explorer.tsx
# src/views/data-explorer/data-explorer.tsx

Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos@contractors.roche.com>
src/components/data-table/data-table.tsx
src/views-components/data-explorer/data-explorer.tsx
src/views/data-explorer/data-explorer.tsx
src/views/workbench/workbench.tsx