kikito 1e8d46d83a fixes failing email specs ...

Conflicts:
	app/models/user.rb

fixes missing i18n entry

fixes badly done merge

fixes i18n issues

force build to start

2016-01-26 18:15:43 +01:00

..

confirmations_controller.rb

Simplify Settings API

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

omniauth_callbacks_controller.rb

fixes failing email specs

2016-01-26 18:15:43 +01:00

registrations_controller.rb

Renames confirmed_oauth_email to oauth_email

2016-01-26 18:15:40 +01:00

sessions_controller.rb

takes the user to the same page he was in after logout

2015-12-22 11:19:06 +01:00