Prefer username/password to openid_url if both are set
authorTom Hughes <tom@compton.nu>
Thu, 16 Apr 2015 10:14:57 +0000 (11:14 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 16 Apr 2015 10:14:57 +0000 (11:14 +0100)
commit2111ace158f3dd9496d49f82529074d77557b2d2
tree43344293cc46783a81ab27db7a0f1b3d5158f020
parentddaf43bc0ecc59f9417118000bb8d2f041cfe6bf
Prefer username/password to openid_url if both are set
app/controllers/user_controller.rb