improve merging accounts
authorDavid A. Cuadrado <krawek@gmail.com>
Wed, 29 Feb 2012 17:44:25 +0000 (12:44 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Wed, 29 Feb 2012 17:44:25 +0000 (12:44 -0500)
commitbde34eb61bccf3c4e02e7c346e871ff25ff3fc53
treef50f040605c6f716b4a3104bb571c5cf8b9f5267
parentf413c23f0970ae71039dbed7adbcc4ad36f781c7
improve merging accounts

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
Gemfile
Gemfile.lock
app/controllers/users_controller.rb
app/views/shared/_social_connect.haml
config/routes.rb