Conflicts: app/controllers/users_controller.rb app/views/users/_account.haml app/views/users/_profile.haml |
||
|---|---|---|
| .. | ||
| _person.html.haml | ||
| edit.html.haml | ||
| index.html.haml | ||
| show.html.haml | ||
Conflicts: app/controllers/users_controller.rb app/views/users/_account.haml app/views/users/_profile.haml |
||
|---|---|---|
| .. | ||
| _person.html.haml | ||
| edit.html.haml | ||
| index.html.haml | ||
| show.html.haml | ||