mastodon/app/views/settings
Claire 9f92b05bd2 Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream has updated their README but we have a completely different one.
  Kept our version of `README.md`
2023-12-10 18:05:02 +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