mastodon/app/views/settings
Claire 6204d13a2e Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile`:
  There was an extra newline in glitch-soc for some reason.
  Removed it.
2024-05-01 19:38:34 +02: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