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 3160e050a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change.		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	4 years ago
views	Improve performance of follow recommendation scheduler (#16159)	4 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