Merge branch 'master' into 14566-admin-modal
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 10 Dec 2018 10:14:55 +0000 (11:14 +0100)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 10 Dec 2018 10:14:55 +0000 (11:14 +0100)
refs #14566

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


Trivial merge