Merge branch 'master' into 13885-refactor-and-unify-icons-on-tree-component
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 23 Jul 2018 15:28:45 +0000 (17:28 +0200)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 23 Jul 2018 15:28:45 +0000 (17:28 +0200)
refs #13885

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


Trivial merge