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

projects / arvados-workbench2.git / commit

author	Daniel Kos <daniel.kos@contractors.roche.com>
	Fri, 3 Aug 2018 05:48:51 +0000 (07:48 +0200)
committer	Daniel Kos <daniel.kos@contractors.roche.com>
	Fri, 3 Aug 2018 05:48:51 +0000 (07:48 +0200)
commit	fbec771115f1872bdadc0572a5c5059be68f1aca
tree	eb5df294eb4328d9dbb5a92d23fbfc0c3c99d303	tree \| snapshot
parent	cba00eaa2d205b13cfa696f866a31452c6511cf3	commit \| diff
parent	6cb43ce8d9ab8345a1b2a5abd961c7c134f5c607	commit \| diff

refs #master Merge branch 'origin/master' into 13901-services-repo

# Conflicts:
# src/services/services.ts
# src/store/favorite-panel/favorite-panel-middleware.ts
# src/store/project-panel/project-panel-middleware.ts
# src/store/store.ts
# src/views/workbench/workbench.tsx

Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos@contractors.roche.com>

RSS Atom

src/index.tsx	diff1 \|	diff2 \|	blob \| history
src/services/services.ts	diff1 \|	diff2 \|	blob \| history
src/store/collection-panel/collection-panel-action.ts	\|	diff2 \|	blob \| history
src/store/collections/creator/collection-creator-action.ts	\|	diff2 \|	blob \| history
src/store/favorite-panel/favorite-panel-middleware-service.ts	\|	diff2 \|	blob \| history
src/store/project-panel/project-panel-middleware-service.ts	\|	diff2 \|	blob \| history
src/store/store.ts	diff1 \|	diff2 \|	blob \| history
src/views/workbench/workbench.tsx	diff1 \|	diff2 \|	blob \| history