Merge branch 'master' into 6234-user-edit-self
authorradhika <radhika@curoverse.com>
Fri, 26 Jun 2015 14:34:33 +0000 (10:34 -0400)
committerradhika <radhika@curoverse.com>
Fri, 26 Jun 2015 14:34:33 +0000 (10:34 -0400)
commit2d4198a095e193102daa2710c6b2baba7be7c9ce
tree6160550a2e0e939c6224843cead516f2c85ef6d9
parent9d9f6578ada5768205150757f241c66009347884
parent1ec9e3707d464e96e0a1c44d3d074842b3b5051b
Merge branch 'master' into 6234-user-edit-self
apps/workbench/test/integration/users_test.rb