Claire 15929a3d59 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes. - `app/javascript/packs/mailer.js`: We had removed the file. Move the changes to `app/javascript/core/mailer.js`.		2022-06-11 00:08:41 +02:00
..
account_actions	…
account_warnings	…
accounts	…
action_logs	…
announcements	…
change_emails	…
custom_emojis	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00
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	…
rules	…
settings	…
statuses	…
tags	…
trends	…
warning_presets	…
webhooks	…