Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring		2022-12-15 20:25:25 +01:00
..
aliases	…
applications	…
deletes	…
exports	…
featured_tags	Render current day formats in the client timezone (#21878)	2022-12-15 16:35:25 +01:00
flavours	…
imports	…
login_activities	…
migration/redirects	…
migrations	…
preferences	…
profiles	…
shared	…
two_factor_authentication	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
two_factor_authentication_methods	…