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 Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
deletes
exports Use different strings on exports page (#12569) 2019-12-19 12:47:55 +01:00
featured_tags
flavours
identity_proofs
imports
migration/redirects
migrations
preferences Merge branch 'master' into glitch-soc/merge-upstream 2020-01-04 23:04:42 +01:00
profiles
shared
two_factor_authentication
two_factor_authentications