git.arvados.org - arvados-workbench2.git/commit

author	Eric Biagiotti <ebiagiotti@veritasgenetics.com>
	Wed, 22 May 2019 21:01:20 +0000 (17:01 -0400)
committer	Eric Biagiotti <ebiagiotti@veritasgenetics.com>
	Wed, 22 May 2019 21:01:20 +0000 (17:01 -0400)
commit	23199ed951991534b1c582dce5b609f758f50a68
tree	63b27c89f0e649219be748649fba38289b9ee787	tree \| snapshot
parent	c75768d4dfcc49eadf410077390ef8c281261594	commit \| diff
parent	547ea9aed5331a2d7a9ffd64807c48294721a686	commit \| diff

Merge branch '15088-merge-account'

refs #15088

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>

src/routes/routes.ts	diff1 \|	diff2 \|	blob \| history
src/store/auth/auth-action.test.ts	diff1 \|	diff2 \|	blob \| history
src/store/navigation/navigation-action.ts	diff1 \|	diff2 \|	blob \| history
src/store/workbench/workbench-actions.ts	diff1 \|	diff2 \|	blob \| history