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)
commit771a7b4e46f0f8369feea88570c944794978563f
tree7df90e5f31c267f79dd62e8511451d42d9673b4d
parent203958b587d05ba1be437a70609a80b35f79368d
parent39717c4347c00ee0697942d60a50000bfc89fe3c
Merge branch 'master' into 2272-setup-user-in-workbench
apps/workbench/app/controllers/users_controller.rb
services/api/app/models/user.rb