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