glitchier-soc/app/javascript
Claire 447b44a5d6 Merge commit '52b4e33d7fca20663e95e943631087d728bee3f6' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Upstream changed various script definitions in lines surrounding the one for
  `i18n:extract`, which had glitch-soc-specific changes.
  Updated the scripts as upstream did, while keeping our changes to
  `i18n:extract`.
2023-06-10 14:38:04 +02:00
..
core Merge commit '7b5a2748360753a903108a6e57caaee3194a5750' into glitch-soc/merge-upstream 2023-05-28 15:54:31 +02:00
flavours [Glitch] Upgrade react-intl 2023-06-10 14:37:08 +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 2023-04-29 10:44:56 +02:00
locales Merge commit '76960f128a764f5105c076813d8ffaa0df985dda' into glitch-soc/merge-upstream 2023-06-10 12:38:33 +02:00
mastodon Merge commit '52b4e33d7fca20663e95e943631087d728bee3f6' into glitch-soc/merge-upstream 2023-06-10 14:38:04 +02:00
packs Merge commit '76960f128a764f5105c076813d8ffaa0df985dda' into glitch-soc/merge-upstream 2023-06-10 12:38:33 +02:00
skins initial translation of Glitch-specific texts into Czech (#1997) 2022-12-08 10:38:52 +01:00
styles Merge commit '52b4e33d7fca20663e95e943631087d728bee3f6' into glitch-soc/merge-upstream 2023-06-10 14:38:04 +02:00
types Remove duplicate JPG type (#25054) 2023-05-22 12:46:20 +02:00