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 20fb459dee 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
..
account_action.rb	Fix account action type validation (#19476)	2 years ago
action_log.rb	Add audit log entries for user roles (#19040)	2 years ago
action_log_filter.rb	Fix inaccurate admin log entry for re-sending confirmation e-mails (#19674)	2 years ago
appeal_filter.rb	Add appeals (#17364)	3 years ago
import.rb	Allow import/export of instance-level domain blocks/allows (#1754)	2 years ago
status_batch_action.rb	Fix reblogs being discarded after the reblogged status (#19731)	2 years ago
status_filter.rb	Add ability to view previous edits of a status in admin UI (#19462)	2 years ago