1
0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-23 16:13:15 -05:00
Claire 60abcb3c4c Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `config/i18n-tasks.yml`:
  Upstream added new ignored strings, glitch-soc has extra ignored strings
  because of the theming system.
  Added upstream's changes.
2023-01-18 17:38:11 +01:00
..
2020-06-02 19:24:53 +02:00
2021-11-25 13:07:38 +01:00
2021-02-21 19:50:12 +01:00