rgarcia cade157acd fixes conflicts with master

2016-01-21 17:27:02 +01:00

..

confirmations_controller.rb

Simplify Settings API

2016-01-18 12:43:34 +01:00

omniauth_callbacks_controller.rb

…

registrations_controller.rb

check if username is available in registration form

2016-01-10 19:17:20 +01:00

sessions_controller.rb

…