Conflicts: app/helpers/application_helper.rb app/views/comments/_comment.html.haml app/views/people/_person.html.haml app/views/shared/_stream_element.html.haml |
||
|---|---|---|
| .. | ||
| _person.html.haml | ||
| _profile_photo_upload.html.haml | ||
| _profile_sidebar.html.haml | ||
| edit.html.haml | ||
| index.html.haml | ||
| show.html.haml | ||