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
..
admin	Add customizable user roles (#18641)	2 years ago
filters_controller.rb	Revamp post filtering system (#18058)	2 years ago
instances_controller.rb	Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294)	2 years ago
media_controller.rb	Change post-processing to be deferred only for large media types (#19617)	2 years ago
search_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
suggestions_controller.rb	Add cold-start follow recommendations (#15945)	4 years ago