From: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
Date: Fri, 17 Aug 2018 13:58:12 +0000 (+0200)
Subject: Merge branch 'master'
X-Git-Tag: 1.3.0~149^2~7
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/158a4936f754ad78004e1bbcbb5af053a6a4073a

Merge branch 'master'

Feature #14013

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
---

158a4936f754ad78004e1bbcbb5af053a6a4073a
diff --cc src/views/workbench/workbench.tsx
index df304aec,5cf632fa..01a92ab4
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -246,7 -246,7 +247,8 @@@ export const Workbench = withStyles(sty
                          <FileRemoveDialog />
                          <MultipleFilesRemoveDialog />
                          <UpdateCollectionDialog />
 +                        <UploadCollectionFilesDialog />
+                         <UpdateProjectDialog />
                          <CurrentTokenDialog
                              currentToken={this.props.currentToken}
                              open={this.state.isCurrentTokenDialogOpen}