Claire b735954971 Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/generateLocalePacks.js`: A dependency update changed how functions are imported. Also, some linting fixes not applicable to glitch-soc.		2023-05-25 20:43:25 +02:00
..
account_actions	Fix more haml-lint Rubocop (#24107)	2023-03-15 20:07:43 +01:00
account_warnings	…
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-16 23:12:59 +01:00
action_logs	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-16 23:12:59 +01:00
announcements	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-15 09:16:10 +01:00
change_emails	Fix more haml-lint Rubocop (#24107)	2023-03-15 20:07:43 +01:00
custom_emojis	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-16 23:12:59 +01:00
dashboard	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-16 23:12:59 +01:00
disputes/appeals	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-15 09:16:10 +01:00
domain_allows	…
domain_blocks	…
email_domain_blocks	…
export_domain_allows	…
export_domain_blocks	…
follow_recommendations	…
instances	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-15 09:16:10 +01:00
invites	…
ip_blocks	…
relationships	…
relays	…
report_notes	Change account moderation notes to make links clickable (#22553)	2023-01-18 16:32:23 +01:00
reports	Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream	2023-05-25 20:43:25 +02:00
roles	…
rules	Setup haml-lint CI with todo config (#23524)	2023-03-15 04:15:36 +01:00
settings	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-09 12:46:12 +01:00
status_edits	…
statuses	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-05 20:46:56 +01:00
tags	…
trends	…
users/roles	…
warning_presets	Setup haml-lint CI with todo config (#23524)	2023-03-15 04:15:36 +01:00
webhooks	Setup haml-lint CI with todo config (#23524)	2023-03-15 04:15:36 +01:00