mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
3ab6a8b8be
Conflicts: spec/views/about/show.html.haml_spec.rb |
||
---|---|---|
.. | ||
_contact.html.haml | ||
_features.html.haml | ||
_forms.html.haml | ||
_links.html.haml | ||
_registration.html.haml | ||
more.html.haml | ||
show.html.haml | ||
terms.html.haml |