Merge branch 'master' of git.curoverse.com:arvados-workbench2 into 14512_admin_links
authorJanicki Artur <artur.janicki@contractors.roche.com>
Wed, 12 Dec 2018 09:55:10 +0000 (10:55 +0100)
committerJanicki Artur <artur.janicki@contractors.roche.com>
Wed, 12 Dec 2018 09:55:10 +0000 (10:55 +0100)
commit454ef1c106b3d738526d65ecfae8db98ad7bebc2
tree2cbc3a8f58e2ca8b3c10453c56d4fb24a4b51b76
parent090f4825bdd30925a10c6df1b9493df0c2e8f541
parentedb6e7b588bc443de1c54782812064f00e6e5b53
Merge branch 'master' of git.curoverse.com:arvados-workbench2 into 14512_admin_links

refs #2
14512

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