You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire b0781a933d 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.		3 years ago
..
_account.html.haml	Change how unconfirmed accounts are displayed in admin UI (#17874)	3 years ago
index.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
show.html.haml	Remove sign-in token authentication, instead send e-mail about new sign-in (#17970)	3 years ago