next conflicts 14504-users-admin-panel
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Fri, 7 Dec 2018 10:05:13 +0000 (11:05 +0100)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Fri, 7 Dec 2018 10:05:13 +0000 (11:05 +0100)
commitcda10815df30e3bceec728535f426754ef8ff2e8
tree28947465ed296421bf8e1f86a62002b6b72dfeb6
parent7a6743eacc2ef5ce99ceca5acbaff8b00fb7e7d1
parent282b04b762cf6366209074333bfd623e3cba58c5
next conflicts

Feature #14504

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
14 files changed:
src/index.tsx
src/routes/route-change-handlers.ts
src/routes/routes.ts
src/store/advanced-tab/advanced-tab.ts
src/store/navigation/navigation-action.ts
src/store/project-panel/project-panel-middleware-service.ts
src/store/store.ts
src/store/users/user-panel-middleware-service.ts
src/store/workbench/workbench-actions.ts
src/store/workflow-panel/workflow-middleware-service.ts
src/views-components/context-menu/context-menu.tsx
src/views-components/main-app-bar/account-menu.tsx
src/views-components/main-content-bar/main-content-bar.tsx
src/views/workbench/workbench.tsx