From: Lucas Di Pentima <ldipentima@veritasgenetics.com>
Date: Tue, 29 Jan 2019 09:30:10 +0000 (-0300)
Subject: Merge branch '14718-api-login-salted-token'
X-Git-Tag: 1.4.0~171
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/d1e00d89dac87929d39c0689a593f0574980f2e8

Merge branch '14718-api-login-salted-token'
Closes #14718

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

d1e00d89dac87929d39c0689a593f0574980f2e8