mastodon/app/views/settings
Claire 297eb7c956 Merge commit '4bd969e4bb54297981d385903bf8a4348b394f09' into glitch-soc/merge-upstream
Conflicts:
- `CONTRIBUTING.md`:
  Upstream modified it while we quote upstream's within an otherwise different file.
  Applied upstream's changes.
2025-01-18 12:42:17 +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