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 4e3c68e025 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Upstream fixed an issue that glitch-soc did not have, in a place with glitch-soc changes to hide the number of followers. Kept glitch-soc's code.		3 years ago
..
migrate	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
post_migrate	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
views	Fix some old migration scripts (#17394)	3 years ago
schema.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
seeds.rb	Change unconfirmed user login behaviour (#11375)	5 years ago