mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-05 04:55:05 +00:00
3ab6a8b8be
Conflicts: spec/views/about/show.html.haml_spec.rb |
||
---|---|---|
.. | ||
_contact.html.haml_spec.rb | ||
show.html.haml_spec.rb |