Claire ec5783c59c Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/services/remove_status_service.rb`: Conflict caused by us having a distinc Direct timeline. Ported upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Conflict between glitch-soc's variable character limit and upstream refactoring that part of the code. Ported upstream changes.		2020-12-05 17:33:37 +01:00
..
two_factor	Add WebAuthn as an alternative 2FA method (#14466)	2020-08-24 16:46:27 +02:00
new.html.haml	Fix omniauth (SAML/CAS) sign-in routes not having CSRF protection (#15228)	2020-11-28 05:17:53 +01:00
sign_in_token.html.haml	Add e-mail-based sign in challenge for users with disabled 2FA (#14013)	2020-06-09 10:23:06 +02:00
two_factor.html.haml	Add subresource integrity for JS and CSS assets (#15096)	2020-11-06 11:56:31 +01:00