Merge branch 'master' into 14988-wb-rails5-upgrade
authorLucas Di Pentima <ldipentima@veritasgenetics.com>
Mon, 13 May 2019 12:25:01 +0000 (09:25 -0300)
committerLucas Di Pentima <ldipentima@veritasgenetics.com>
Mon, 13 May 2019 12:25:01 +0000 (09:25 -0300)
commitad25d712525293ce4f95f5a059b390036ec60dc3
tree548c897eafe7ee9b1fe80c0c822c92729a66ce20
parent096134a964067c5dd2f3b3473f05b390fef8e7ab
parent0f1476fae8e60066c536ae85937975b793d6fb08
Merge branch 'master' into 14988-wb-rails5-upgrade

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>