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.

Thibaut Girka 0437d70628 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/follower_accounts_controller.rb`: Conflict due to upstream changing suspension logic while glitch-soc has an extra option to hide followers count. Ported upstream changes.		4 years ago
..
migrate	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
post_migrate	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
schema.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
seeds.rb	Change unconfirmed user login behaviour (#11375)	5 years ago