projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 30436ed aae18e1)
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)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

1  2 
services/api/app/models/user.rb patch | diff1 | diff2 | blob | history

diff --cc services/api/app/models/user.rb
Simple merge