Conflicts: app/assets/stylesheets/basic/global.css app/views/devise/sessions/new.html.erb app/views/layouts/devise.html.erb |
||
|---|---|---|
| .. | ||
| confirmations | ||
| mailer | ||
| menu | ||
| passwords | ||
| registrations | ||
| sessions | ||
| shared | ||
| unlocks | ||
Conflicts: app/assets/stylesheets/basic/global.css app/views/devise/sessions/new.html.erb app/views/layouts/devise.html.erb |
||
|---|---|---|
| .. | ||
| confirmations | ||
| mailer | ||
| menu | ||
| passwords | ||
| registrations | ||
| sessions | ||
| shared | ||
| unlocks | ||