projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 156f718 eb0012d)
Merge branch '10557-auto-setup'
authorTom Clegg <tom@curoverse.com>
Thu, 15 Jun 2017 16:11:13 +0000 (12:11 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 15 Jun 2017 16:11:13 +0000 (12:11 -0400)
refs #10557

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>

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

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