mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-17 21:22:55 -05:00
3ab6a8b8be
Conflicts: spec/views/about/show.html.haml_spec.rb