Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: glitch-soc change because of having changed the default number of available poll options. Applied upstream's changes while keeping glitch-soc's default number of poll options. - `public/oops.png`: We had a minor graphics change, probably not worth diverging from upstream. Took upstream version.		2022-11-06 09:50:41 +01:00
..
trends	Refactor formatter (#17828)	2022-03-26 02:53:34 +01:00
account_moderation_notes_helper.rb	Add appeals (#17364)	2022-02-14 21:27:53 +01:00
action_logs_helper.rb	Fix admin action logs page (#19649)	2022-11-03 16:06:42 +01:00
announcements_helper.rb	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
dashboard_helper.rb	Fix admin interface crash when displaying deleted user (#17301)	2022-01-16 20:57:37 +01:00
filter_helper.rb	Add trending statuses (#17431)	2022-02-25 00:34:14 +01:00
settings_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00