Merge branch 'master' into 14565-admin-managing-user
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Tue, 18 Dec 2018 09:09:50 +0000 (10:09 +0100)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Tue, 18 Dec 2018 09:09:50 +0000 (10:09 +0100)
commit6faff5910b3e7bdaf47ab5ede7cf8094a1b4adb9
tree23a3dbd912618dbfa0f764cff882e96a54d33f63
parent229eaf53b39af3a7e9408ed5f7e49d74b318445a
parentb6f9b49e6fed67626ae969a6864f45f002fcfd47
Merge branch 'master' into 14565-admin-managing-user

refs #14565

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