merged with dev

Author: aadams0

src/client/components-v2/App.tsx

@@ -39,7 +39,7 @@ const App = () => {
         <Box sx={{ height: '100%', display: 'flex' }}>
           {/* New MUI workspace. */}
           {/* <WorkspaceContainer currentWorkspaceId={currentWorkspaceId} setWorkspace={setWorkspace} /> */}
-          {/* <HistoryOrWorkspaceContainer currentWorkspaceId={currentWorkspaceId} setWorkspace={setWorkspace} /> */}
+          <HistoryOrWorkspaceContainer currentWorkspaceId={currentWorkspaceId} setWorkspace={setWorkspace} />
           {/* Legacy workspace. */}
           {/* <ContentsContainer /> */}
           <Divider orientation="vertical"/>