Conflicts: app/controllers/users_controller.rb app/views/users/_account.haml app/views/users/_profile.haml |
||
|---|---|---|
| .. | ||
| 1.html.haml | ||
| 2.html.haml | ||
| 3.html.haml | ||
Conflicts: app/controllers/users_controller.rb app/views/users/_account.haml app/views/users/_profile.haml |
||
|---|---|---|
| .. | ||
| 1.html.haml | ||
| 2.html.haml | ||
| 3.html.haml | ||