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
..
migrate	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
post_migrate	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
seeds	Add customizable user roles (#18641)	2 years ago
views	Fix some old migration scripts (#17394)	3 years ago
schema.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
seeds.rb	Add customizable user roles (#18641)	2 years ago