Merge branch 'master' into 14946-ruby-2.5
authorLucas Di Pentima <ldipentima@veritasgenetics.com>
Mon, 10 Jun 2019 17:45:54 +0000 (14:45 -0300)
committerLucas Di Pentima <ldipentima@veritasgenetics.com>
Mon, 10 Jun 2019 17:45:54 +0000 (14:45 -0300)
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>

1  2 
build/run-tests.sh
services/api/app/controllers/application_controller.rb

Simple merge