merge master
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Tue, 28 Aug 2018 15:33:34 +0000 (17:33 +0200)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Tue, 28 Aug 2018 15:33:34 +0000 (17:33 +0200)
Feature #13858

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>

1  2 
src/views/workbench/workbench.tsx

index 27470fa43086c2ebdd78630eec1db39b01ecdefc,82a868e6dece3fb472d53d11b1fa99fa8c20461d..1d53842b422bcbcb4484b6607c355d46fa5d8445
@@@ -36,7 -34,9 +34,10 @@@ import { UpdateCollectionDialog } from 
  import { UpdateProjectDialog } from '~/views-components/dialog-forms/update-project-dialog';
  import { MoveProjectDialog } from '~/views-components/dialog-forms/move-project-dialog';
  import { MoveCollectionDialog } from '~/views-components/dialog-forms/move-collection-dialog';
 +import { ProcessPanel } from '~/views/process-panel/process-panel';
+ import { UploadCollectionFilesDialog } from '~/views-components/dialog-forms/upload-collection-files-dialog';
+ import { PartialCopyCollectionDialog } from '~/views-components/dialog-forms/partial-copy-collection-dialog';
  
  const APP_BAR_HEIGHT = 100;