6d1023b2e9
Conflicts: app/javascript/styles/mastodon/components.scss |
||
---|---|---|
.. | ||
_contact.html.haml | ||
_features.html.haml | ||
_links.html.haml | ||
_registration.html.haml | ||
more.html.haml | ||
show.html.haml | ||
terms.html.haml |
6d1023b2e9
Conflicts: app/javascript/styles/mastodon/components.scss |
||
---|---|---|
.. | ||
_contact.html.haml | ||
_features.html.haml | ||
_links.html.haml | ||
_registration.html.haml | ||
more.html.haml | ||
show.html.haml | ||
terms.html.haml |