Merge branch 'master' into 3296-user-profile
authorradhika <radhika@curoverse.com>
Thu, 7 Aug 2014 01:11:30 +0000 (21:11 -0400)
committerradhika <radhika@curoverse.com>
Thu, 7 Aug 2014 01:11:30 +0000 (21:11 -0400)
commitfde712e92ad33e03dfd79f5fca99d2005cdd0795
treef262a3ca17b2bb78930c7f559c5b640c869d892f
parentc424885353afb06ac835e6d44be2d838d193d49f
parentb82d80addf80b9ead7c63f85f72613042b3b2c51
Merge branch 'master' into 3296-user-profile
apps/workbench/app/controllers/application_controller.rb