improve merging accounts
authorDavid A. Cuadrado <krawek@gmail.com>
Wed, 29 Feb 2012 17:44:25 +0000 (12:44 -0500)
committerPatrick Aljord <patcito@gmail.com>
Fri, 30 Mar 2012 23:45:39 +0000 (18:45 -0500)
commite80ca13d90d5cb485a3a57bc7bd9b4b9aee6f41b
treeeed1ed1b31a00a339d3351a47ef5f062713a05f5
parentcd52042b2f6b2af7a3a774b35607bc0e0a992b9a
improve merging accounts

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