projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 203958b 39717c4)
Merge branch 'master' into 2272-setup-user-in-workbench
authorradhika chippada <radhika@radhika.curoverse>
Fri, 4 Apr 2014 02:44:18 +0000 (22:44 -0400)
committerradhika chippada <radhika@radhika.curoverse>
Fri, 4 Apr 2014 02:44:18 +0000 (22:44 -0400)
1  2 
apps/workbench/app/controllers/users_controller.rb patch | diff1 | diff2 | blob | history
services/api/app/models/user.rb patch | diff1 | diff2 | blob | history

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