merge-conflicts
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 20 Aug 2018 09:25:45 +0000 (11:25 +0200)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 20 Aug 2018 09:25:45 +0000 (11:25 +0200)
commit1bd016d1f30c72353e5e3b086dd9778b74efb516
tree102c513c545312da4aad83c7808233dd7f5e1eb4
parente6ce4acd9ac2ed0d93e5aafe8df8fb1e16ee956d
parent75db1e88374315f84fdfb30faee84253e1383a28
merge-conflicts

Feature #13902

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
src/index.tsx
src/store/data-explorer/data-explorer-reducer.test.tsx
src/store/tree-picker/tree-picker-reducer.test.ts
src/views-components/tree-picker/tree-picker.ts
src/views/workbench/workbench.tsx