mastodon/app/views/settings
Thibaut Girka 66ad30db48 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  No real conflict, upstream updated a dependency which is
  textually adjacent to a glitch-soc-specific dependency.
  Updated it.
- `yarn.lock`:
  No real conflict, upstream updated a dependency which is
  textually adjacent to a glitch-soc-specific dependency.
  Updated it.
2020-04-15 17:07:49 +02:00
..
aliases Fix account aliases page (#13452) 2020-04-13 06:41:43 +02:00
applications Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
deletes
…
exports
…
featured_tags
…
flavours
…
identity_proofs
…
imports
…
migration/redirects
…
migrations
…
preferences Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
profiles Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
shared
…
two_factor_authentication
…
two_factor_authentications
…