Claire b61c3ddff8 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream added some text, but our README is completely different. Kept our README unchanged.		2022-01-16 18:11:20 +01:00
..
account_actions
account_moderation_notes
account_warnings
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-16 18:11:20 +01:00
action_logs	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-24 10:53:50 +01:00
announcements
change_emails
custom_emojis
dashboard	Merge branch 'main' into glitch-soc/merge-upstream	2021-12-16 16:20:44 +01:00
domain_allows
domain_blocks
email_domain_blocks
follow_recommendations	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
instances	Add ability to purge undeliverable domains from admin interface (#16686)	2021-12-17 23:01:21 +01:00
invites
ip_blocks	Merge branch 'main' into glitch-soc/merge-upstream	2021-12-16 16:20:44 +01:00
relationships
relays
report_notes
reports	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-11 21:41:23 +02:00
rules	Fix missing source strings and inconsistent lead text style in admin UI (#16052)	2021-04-17 11:12:49 +02:00
settings	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-26 22:53:55 +01:00
statuses
tags	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-25 23:50:35 +01:00
trends	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-26 01:15:32 +01:00
warning_presets