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 f8d867bac4 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.		4 years ago
..
two_factor	Add WebAuthn as an alternative 2FA method (#14466)	4 years ago
new.html.haml	Fix omniauth (SAML/CAS) sign-in routes not having CSRF protection (#15228)	4 years ago
sign_in_token.html.haml	Add e-mail-based sign in challenge for users with disabled 2FA (#14013)	5 years ago
two_factor.html.haml	Add subresource integrity for JS and CSS assets (#15096)	4 years ago