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
..
two_factor	Fix style for hashes (#20518)	2022-11-17 11:05:39 +01:00
new.html.haml	Add explanation text to log-in page (#20946)	2022-12-15 16:44:29 +01:00
two_factor.html.haml