Claire
734e186717
Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/load_locale.js`:
The file moved to `app/javascript/mastodon/locales/load_locale.ts`.
Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`.
- `app/javascript/mastodon/locales/index.js`:
The file moved to `app/javascript/mastodon/locales/index.ts`.
Did *not* port the changes as I want to try something a bit different.
2023-06-10 15:32:29 +02:00
..
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-06-01 09:37:38 +02:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-06-02 15:00:27 +02:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-06-02 15:00:27 +02:00
2023-06-02 15:00:27 +02:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-06-10 15:32:29 +02:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00
2023-04-30 17:02:11 +09:00