Claire 179f1d3a78 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.		2021-12-16 16:20:44 +01:00
..
migrate	Merge branch 'main' into glitch-soc/merge-upstream	2021-12-16 16:20:44 +01:00
post_migrate	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-26 22:53:55 +01:00
views	Fix follow recommendation biased towards older accounts (#17126)	2021-12-13 23:21:14 +01:00
schema.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-12-16 16:20:44 +01:00
seeds.rb	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +02:00