conflicts
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 3 Dec 2018 12:32:53 +0000 (13:32 +0100)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 3 Dec 2018 12:32:53 +0000 (13:32 +0100)
commitcc72c29b709759a4498ad232e3f0374e857c7a62
tree237f7ff206c5ce96e7a6b96fc5b079a6c33b0ff4
parent60e8ad5f90108900b4c189f88fbe483e7010432e
parent8695e9d621330e691fbcc4bbc1d600d91bae2ac6
conflicts

Feature #14498

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
src/index.tsx
src/services/auth-service/auth-service.ts
src/store/advanced-tab/advanced-tab.ts
src/store/context-menu/context-menu-actions.ts
src/store/keep-services/keep-services-actions.ts
src/views-components/context-menu/action-sets/keep-service-action-set.ts
src/views-components/context-menu/context-menu.tsx
src/views/keep-service-panel/keep-service-panel-root.tsx
src/views/keep-service-panel/keep-service-panel.tsx
src/views/workbench/workbench.tsx