621affecb5
Conflicts: Gemfile.lock app/helpers/application_helper.rb app/views/devise/sessions/new.html.erb db/schema.rb |
||
---|---|---|
.. | ||
confirmations | ||
mailer | ||
passwords | ||
registrations | ||
sessions | ||
shared | ||
unlocks |
621affecb5
Conflicts: Gemfile.lock app/helpers/application_helper.rb app/views/devise/sessions/new.html.erb db/schema.rb |
||
---|---|---|
.. | ||
confirmations | ||
mailer | ||
passwords | ||
registrations | ||
sessions | ||
shared | ||
unlocks |