9a40ecd1d9
Conflicts: app/views/devise/passwords/new.html.erb app/views/devise/sessions/new.html.erb |
||
---|---|---|
.. | ||
confirmations | ||
mailer | ||
menu | ||
passwords | ||
registrations | ||
sessions | ||
shared | ||
unlocks |
9a40ecd1d9
Conflicts: app/views/devise/passwords/new.html.erb app/views/devise/sessions/new.html.erb |
||
---|---|---|
.. | ||
confirmations | ||
mailer | ||
menu | ||
passwords | ||
registrations | ||
sessions | ||
shared | ||
unlocks |