Merge branch 'master' into 15803-unsetup
authorPeter Amstutz <pamstutz@veritasgenetics.com>
Mon, 18 Nov 2019 21:56:40 +0000 (16:56 -0500)
committerPeter Amstutz <pamstutz@veritasgenetics.com>
Mon, 18 Nov 2019 21:56:40 +0000 (16:56 -0500)
commit5022c4068227e4d354389169a9abd726206aff7d
tree0af76277c90fa0464fa95a23d56afe6366f9bc12
parent30436ed9a7bb17ebb3ccc9e6f9938c086917bd69
parentaae18e1164b31dc835e41784263d25b79893a6b3
Merge branch 'master' into 15803-unsetup

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>
services/api/app/models/user.rb