Glitch-Shrike/app/views/settings
Claire 59864ff495 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Upstream modified it, but we deleted it in glitch-soc.
  Keep it deleted.
2022-03-22 17:00:38 +01:00
..
aliases Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +01:00
applications
deletes
exports
featured_tags
flavours
imports
login_activities
migration/redirects
migrations Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +01:00
preferences Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
profiles Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
shared
two_factor_authentication
two_factor_authentication_methods