mirror of
https://github.com/mastodon/mastodon.git
synced 2025-03-19 11:21:38 +01:00
Conflicts: - `app/views/admin/reports/show.html.haml`: Conflicts due to glitch-soc's theming system. |
||
---|---|---|
.. | ||
_action_log.html.haml | ||
index.html.haml |