This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/views/settings
Thibaut Girka dc2ab6e646 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/public.js`:
  Upstream removed an unused function in code that has
  been refactored a bit. Removed that function in the corresponding
  places.
2020-01-20 18:31:11 +01:00
..
aliases
applications
deletes
exports
featured_tags
flavours
identity_proofs
imports
migration/redirects
migrations
preferences
profiles
shared
two_factor_authentication
two_factor_authentications