3e3fc8398b
Conflicts: - `app/views/admin/trends/links/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes. - `app/views/admin/trends/links/preview_card_providers/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes. - `app/views/admin/trends/statuses/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes. - `app/views/admin/trends/tags/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes. |
||
---|---|---|
.. | ||
account_actions | ||
account_warnings | ||
accounts | ||
action_logs | ||
announcements | ||
change_emails | ||
custom_emojis | ||
dashboard | ||
disputes/appeals | ||
domain_allows | ||
domain_blocks | ||
email_domain_blocks | ||
follow_recommendations | ||
instances | ||
invites | ||
ip_blocks | ||
relationships | ||
relays | ||
report_notes | ||
reports | ||
rules | ||
settings | ||
statuses | ||
tags | ||
trends | ||
warning_presets |