mirror of
https://github.com/funamitech/mastodon
synced 2024-12-13 14:18:34 +09:00
b3bf32a21e
Conflicts: - `app/views/admin/reports/show.html.haml`: Conflicts due to glitch-soc's theming system. |
||
---|---|---|
.. | ||
_status.html.haml | ||
index.html.haml | ||
show.html.haml |