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 b2526316f5 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/pending_accounts/index.html.haml`: Removed upstream, while it had glitch-soc-specific changes to accomodate for glitch-soc's theming system. Removed the file. Additional changes: - `app/views/admin/accounts/index.html.haml': Accomodate for glitch-soc's theming system.		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 follow recommendation biased towards older accounts (#17126)	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