You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		2 years ago
..
trends	Refactor formatter (#17828)	3 years ago
account_moderation_notes_helper.rb	Add appeals (#17364)	3 years ago
action_logs_helper.rb	Fix admin action logs page (#19649)	2 years ago
announcements_helper.rb	Add announcements (#12662)	5 years ago
dashboard_helper.rb	Fix admin interface crash when displaying deleted user (#17301)	3 years ago
filter_helper.rb	Add trending statuses (#17431)	3 years ago
settings_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago