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.		2022-04-06 21:10:23 +02:00
..
two_factor	Add WebAuthn as an alternative 2FA method (#14466)	2020-08-24 16:46:27 +02:00
new.html.haml	Add OMNIAUTH_ONLY environment variable to enforce externa log-in (#17288)	2022-01-23 15:52:58 +01:00
two_factor.html.haml	Add subresource integrity for JS and CSS assets (#15096)	2020-11-06 11:56:31 +01:00