Conflicts: app/controllers/users_controller.rb app/views/users/_account.haml app/views/users/_profile.haml |
||
|---|---|---|
| .. | ||
| album.rb | ||
| aspect.rb | ||
| comment.rb | ||
| person.rb | ||
| photo.rb | ||
| post.rb | ||
| profile.rb | ||
| request.rb | ||
| retraction.rb | ||
| service.rb | ||
| status_message.rb | ||
| user.rb | ||
Conflicts: app/controllers/users_controller.rb app/views/users/_account.haml app/views/users/_profile.haml |
||
|---|---|---|
| .. | ||
| album.rb | ||
| aspect.rb | ||
| comment.rb | ||
| person.rb | ||
| photo.rb | ||
| post.rb | ||
| profile.rb | ||
| request.rb | ||
| retraction.rb | ||
| service.rb | ||
| status_message.rb | ||
| user.rb | ||