mastodon/app/javascript
Claire ce12934f5b Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Upstream removed a dependency that was textually close to a glitch-soc-only
  dependency.
  Removed the dependency as upstream did, while keeping the glitch-soc-only
  dependency.
2023-04-09 11:45:08 +02:00
..
core [Glitch] Run eslint --fix 2023-02-03 20:52:07 +01:00
flavours New Crowdin updates (#2126) 2023-04-05 20:28:34 +02:00
fonts Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
hooks [Proposal] Make able to write React in Typescript (#16210) 2023-04-03 03:31:39 +02:00
icons png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01:00
images Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
locales Move locale-data back to `app/javascript/mastodon/locales/locale-data` (#2169) 2023-04-08 14:11:40 +02:00
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2023-04-09 11:45:08 +02:00
packs Merge branch 'main' into glitch-soc/merge-upstream 2023-04-09 11:45:08 +02:00
skins initial translation of Glitch-specific texts into Czech (#1997) 2022-12-08 10:38:52 +01:00
styles Merge branch 'main' into glitch-soc/merge-upstream 2023-04-09 11:45:08 +02:00
types New Crowdin updates (#24276) 2023-04-03 14:44:43 +02:00