Conflicts: spec/views/about/show.html.haml_spec.rb |
||
|---|---|---|
| .. | ||
| fonts | ||
| mastodon | ||
| application.scss | ||
| mailer.scss | ||
| win95.scss | ||
Conflicts: spec/views/about/show.html.haml_spec.rb |
||
|---|---|---|
| .. | ||
| fonts | ||
| mastodon | ||
| application.scss | ||
| mailer.scss | ||
| win95.scss | ||