Conflicts: app/views/devise/passwords/new.html.erb app/views/devise/sessions/new.html.erb |
||
|---|---|---|
| .. | ||
| attribute.rb | ||
| attribute_field.rb | ||
| attribute_value.rb | ||
| info.rb | ||
| role.rb | ||
| sub_role.rb | ||
| user.rb | ||
Conflicts: app/views/devise/passwords/new.html.erb app/views/devise/sessions/new.html.erb |
||
|---|---|---|
| .. | ||
| attribute.rb | ||
| attribute_field.rb | ||
| attribute_value.rb | ||
| info.rb | ||
| role.rb | ||
| sub_role.rb | ||
| user.rb | ||