Merge branch 'master' into 13903-edit-collection-popup
authorJanicki Artur <artur.janicki@contractors.roche.com>
Thu, 2 Aug 2018 13:01:11 +0000 (15:01 +0200)
committerJanicki Artur <artur.janicki@contractors.roche.com>
Thu, 2 Aug 2018 13:01:11 +0000 (15:01 +0200)
commitc16bd80e93d4f5613f4c0a8ef973502932c62486
tree5ee55e41ae24151f75ced15253eb3b52a76480db
parentcf13821286d46158198dde609de9bbb7363c53e3
parent6cb43ce8d9ab8345a1b2a5abd961c7c134f5c607
Merge branch 'master' into 13903-edit-collection-popup

refs #13903

Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki@contractors.roche.com>
src/store/store.ts
src/views-components/context-menu/action-sets/collection-action-set.ts
src/views/workbench/workbench.tsx