Conflicts: app/assets/stylesheets/basic/global.css app/views/devise/sessions/new.html.erb app/views/layouts/devise.html.erb |
||
|---|---|---|
| .. | ||
| assets | ||
| controllers | ||
| errors | ||
| helpers | ||
| jobs | ||
| mailer | ||
| models | ||
| uploaders | ||
| views | ||
Conflicts: app/assets/stylesheets/basic/global.css app/views/devise/sessions/new.html.erb app/views/layouts/devise.html.erb |
||
|---|---|---|
| .. | ||
| assets | ||
| controllers | ||
| errors | ||
| helpers | ||
| jobs | ||
| mailer | ||
| models | ||
| uploaders | ||
| views | ||