Conflicts: app/views/albums/show.html.haml app/views/authors/show.html.haml app/views/layouts/application.html.haml app/views/photos/show.html.haml |
||
|---|---|---|
| .. | ||
| _new_status_message.haml | ||
| _status_message.html.haml | ||
| index.html.haml | ||
| new.html.haml | ||
| show.html.haml | ||