Conflicts: app/views/layouts/application.html.haml app/views/status_messages/_status_message.html.haml |
||
|---|---|---|
| .. | ||
| blueprint | ||
| sass | ||
| .gitkeep | ||
| application.css | ||
Conflicts: app/views/layouts/application.html.haml app/views/status_messages/_status_message.html.haml |
||
|---|---|---|
| .. | ||
| blueprint | ||
| sass | ||
| .gitkeep | ||
| application.css | ||