mirror of
https://github.com/funamitech/mastodon
synced 2024-12-05 10:18:45 +09:00
b2526316f5
Conflicts: - `app/views/admin/pending_accounts/index.html.haml`: Removed upstream, while it had glitch-soc-specific changes to accomodate for glitch-soc's theming system. Removed the file. Additional changes: - `app/views/admin/accounts/index.html.haml': Accomodate for glitch-soc's theming system. |
||
---|---|---|
.. | ||
_ip_block.html.haml | ||
index.html.haml | ||
new.html.haml |