Conflicts: - `CHANGELOG.md`: Upstream added newlines. Conflicts are because the CHANGELOG was independently merged from 3.4.6 on last security update. Took upstream's version. - `app/helpers/context_helper.rb`: Conflicts because of extra vocabulary in glitch-soc. The conflicts were actually handled in last security merge. Kept our version. |
||
---|---|---|
.. | ||
account_actions | ||
account_moderation_notes | ||
account_warnings | ||
accounts | ||
action_logs | ||
announcements | ||
change_emails | ||
custom_emojis | ||
dashboard | ||
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 |