15107: Merge branch 'master' into 15107-rails-bad-redirect
authorTom Clegg <tclegg@veritasgenetics.com>
Fri, 15 Nov 2019 03:56:58 +0000 (22:56 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Fri, 15 Nov 2019 03:56:58 +0000 (22:56 -0500)
commit983669a566b89e56640638d85f40a77ce38a42b0
tree863b699618d9215650da557c73b67b4b82dd4bc8
parent4e03c16ce84982605e8f5b2a56dd19ab0a11980c
parentd97c9ecca25f449ad928963f6257a01a8bbbf1e7
15107: Merge branch 'master' into 15107-rails-bad-redirect

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>