Claire b368c75029 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Upstream removed this file, while glitch-soc had changes to deal with its theming system. Removed the file like upstream did.		2022-04-06 21:10:23 +02:00
..
_account.html.haml	Change how unconfirmed accounts are displayed in admin UI (#17874)	2022-03-26 02:53:13 +01:00
index.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-22 17:00:38 +01:00
show.html.haml	Remove sign-in token authentication, instead send e-mail about new sign-in (#17970)	2022-04-06 20:58:12 +02:00