mastodon/app/views/settings
Claire a5127d0ef8 Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream
Conflicts:
- `config/routes/api.rb`:
  glitch-soc has an extra `:destroy` action on notifications for historical reasons.
  Kept it for now, while otherwise updating as upstream did.
2024-03-11 17:29:07 +01:00
..
aliases
applications
deletes
exports
featured_tags
flavours
imports
login_activities
migration/redirects
migrations
preferences
privacy
profiles
shared
two_factor_authentication
two_factor_authentication_methods
verifications