merge

Gemfile

Gemfile.lock

README.md

app/assets/stylesheets/admin.sass

app/controllers/application_controller.rb

app/controllers/application_controller/with_errors.rb

app/controllers/concerns/with_locale.rb

app/controllers/users/confirmations_controller.rb

app/controllers/users/passwords_controller.rb

app/controllers/users/registrations_controller.rb

app/controllers/users/sessions_controller.rb

app/controllers/users/unlocks_controller.rb

app/services/locale_service.rb

app/views/devise/confirmations/new.html.erb

app/views/devise/passwords/edit.html.erb

app/views/devise/passwords/new.html.erb

app/views/devise/registrations/edit.html.erb

app/views/devise/registrations/new.html.erb

app/views/devise/sessions/new.html.erb

app/views/devise/shared/_links.html.erb