mirror of
https://github.com/mastodon/mastodon.git
synced 2025-02-09 10:48:25 +01:00
b3bf32a21e
Conflicts: - `app/views/admin/reports/show.html.haml`: Conflicts due to glitch-soc's theming system.