Merge branch 'master' of git.curoverse.com:arvados-workbench2 into 14500_admin_api_tokens 14500_admin_api_tokens
authorJanicki Artur <artur.janicki@contractors.roche.com>
Fri, 7 Dec 2018 09:48:35 +0000 (10:48 +0100)
committerJanicki Artur <artur.janicki@contractors.roche.com>
Fri, 7 Dec 2018 09:48:35 +0000 (10:48 +0100)
commit3865bd152892a1ad5f85f23d085268837db8c9ee
tree91fbef0cc1a9977f8fd53cc9ac7dcfdbcd78adf3
parenteb8fb03156072ae7d9c289d8d7156fc2d94e40be
parent663ddeefc6a120d6dba213b1392805146d659721
Merge branch 'master' of git.curoverse.com:arvados-workbench2 into 14500_admin_api_tokens

refs #2
14500

Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki@contractors.roche.com>
src/routes/route-change-handlers.ts
src/routes/routes.ts
src/store/navigation/navigation-action.ts
src/store/workbench/workbench-actions.ts
src/views-components/main-app-bar/account-menu.tsx
src/views/workbench/workbench.tsx