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.		2020-11-08 14:20:35 +01:00
..
migrate	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-08 14:20:35 +01:00
post_migrate	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-08 14:20:35 +01:00
schema.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-08 14:20:35 +01:00
seeds.rb	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +02:00