Conflicts: app/assets/stylesheets/basic/global.css app/views/devise/sessions/new.html.erb app/views/layouts/devise.html.erb |
||
|---|---|---|
| .. | ||
| new.html.erb | ||
Conflicts: app/assets/stylesheets/basic/global.css app/views/devise/sessions/new.html.erb app/views/layouts/devise.html.erb |
||
|---|---|---|
| .. | ||
| new.html.erb | ||