Merge branch 'master' into 3296-user-profile
authorradhika <radhika@curoverse.com>
Tue, 12 Aug 2014 19:10:46 +0000 (15:10 -0400)
committerradhika <radhika@curoverse.com>
Tue, 12 Aug 2014 19:10:46 +0000 (15:10 -0400)
commit32af86f5f4a2849b12c96e40ed20d33b7682ba55
treee234d1d4d5993fb063307ef97a0b2576e7f9fa71
parent19e913d3b754429be49c38505c249b7b2151a70f
parent71ed41b87ab6b1b2db92752c59fdf7cf59c2b2cd
Merge branch 'master' into 3296-user-profile
apps/workbench/app/controllers/application_controller.rb