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