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 |
||
|---|---|---|
| .. | ||
| application.html.haml | ||
| session_wall.html.haml | ||
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 |
||
|---|---|---|
| .. | ||
| application.html.haml | ||
| session_wall.html.haml | ||