Merge branch 'master' into 13864-Virtual-machines
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 26 Nov 2018 12:09:02 +0000 (13:09 +0100)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 26 Nov 2018 12:09:02 +0000 (13:09 +0100)
commitb3ffad71aa43fcb8db2d2c7a20ee0ef588e37e04
tree9d76fa22a24b2326e046395aa48f1dfa961b3363
parent944b7786dd97c8de8f7cb9eb7e6446fc2dda58fd
parentfec23dba0d04028d842cc0e2f832ec84828f5bae
Merge branch 'master' into 13864-Virtual-machines

refs #13864

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
src/components/icon/icon.tsx
src/models/resource.ts
src/views/workbench/workbench.tsx