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)
commit021d36f17fe0329e869324d3764eaaf15c3a0771
tree1364250efb57ad7535114ae75eff6245e067fa03
parent156f7186528045a58628c58f3b4b48fcb3825cd5
parenteb0012d203974e54023dfcac6e04fd4c2c40270f
Merge branch '10557-auto-setup'

refs #10557

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>
services/api/app/models/user.rb