git.arvados.org - arvados.git/commit

projects / arvados.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7a6743e 282b04b)

author	Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
	Fri, 7 Dec 2018 10:05:13 +0000 (11:05 +0100)
committer	Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
	Fri, 7 Dec 2018 10:05:13 +0000 (11:05 +0100)
commit	cda10815df30e3bceec728535f426754ef8ff2e8
tree	28947465ed296421bf8e1f86a62002b6b72dfeb6	tree \| snapshot
parent	7a6743eacc2ef5ce99ceca5acbaff8b00fb7e7d1	commit \| diff
parent	282b04b762cf6366209074333bfd623e3cba58c5	commit \| diff

next conflicts

Feature #14504

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>

14 files changed:

src/index.tsx	diff1 \|	diff2 \|	blob \| history
src/routes/route-change-handlers.ts	diff1 \|	diff2 \|	blob \| history
src/routes/routes.ts	diff1 \|	diff2 \|	blob \| history
src/store/advanced-tab/advanced-tab.ts	diff1 \|	diff2 \|	blob \| history
src/store/navigation/navigation-action.ts	diff1 \|	diff2 \|	blob \| history
src/store/project-panel/project-panel-middleware-service.ts	diff1 \|	diff2 \|	blob \| history
src/store/store.ts	diff1 \|	diff2 \|	blob \| history
src/store/users/user-panel-middleware-service.ts	diff1 \|	\|	blob \| history
src/store/workbench/workbench-actions.ts	diff1 \|	diff2 \|	blob \| history
src/store/workflow-panel/workflow-middleware-service.ts	diff1 \|	diff2 \|	blob \| history
src/views-components/context-menu/context-menu.tsx	diff1 \|	diff2 \|	blob \| history
src/views-components/main-app-bar/account-menu.tsx	diff1 \|	diff2 \|	blob \| history
src/views-components/main-content-bar/main-content-bar.tsx	diff1 \|	diff2 \|	blob \| history
src/views/workbench/workbench.tsx	diff1 \|	diff2 \|	blob \| history