mastodon-glitch/app/javascript/mastodon/locales/locale-data
Claire 4e3c68e025 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Upstream fixed an issue that glitch-soc did not have, in a place with
  glitch-soc changes to hide the number of followers.
  Kept glitch-soc's code.
2022-03-17 19:23:39 +01:00
..
co.js
sa.js Fix Sanskrit translation not being used when selected (#17820) 2022-03-17 12:54:40 +01:00