mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-20 20:27:07 +00:00
60abcb3c4c
Conflicts: - `config/i18n-tasks.yml`: Upstream added new ignored strings, glitch-soc has extra ignored strings because of the theming system. Added upstream's changes. |
||
---|---|---|
.. | ||
account_actions | ||
account_warnings | ||
accounts | ||
action_logs | ||
announcements | ||
change_emails | ||
custom_emojis | ||
dashboard | ||
disputes/appeals | ||
domain_allows | ||
domain_blocks | ||
email_domain_blocks | ||
export_domain_allows | ||
export_domain_blocks | ||
follow_recommendations | ||
instances | ||
invites | ||
ip_blocks | ||
relationships | ||
relays | ||
report_notes | ||
reports | ||
roles | ||
rules | ||
settings | ||
status_edits | ||
statuses | ||
tags | ||
trends | ||
users/roles | ||
warning_presets | ||
webhooks |