9a40ecd1d9
Conflicts: app/views/devise/passwords/new.html.erb app/views/devise/sessions/new.html.erb |
||
---|---|---|
.. | ||
edit.html.erb | ||
new.html.erb |
9a40ecd1d9
Conflicts: app/views/devise/passwords/new.html.erb app/views/devise/sessions/new.html.erb |
||
---|---|---|
.. | ||
edit.html.erb | ||
new.html.erb |