Merge commit '4a7395d989' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Upstream modified its README, we have a completely different one.
  Kept our README file.
This commit is contained in:
Claire 2023-12-21 18:17:17 +01:00
commit 6e56f95285
71 changed files with 1411 additions and 1149 deletions

View file

@ -205,7 +205,7 @@
"prettier": "^3.0.0",
"react-test-renderer": "^18.2.0",
"stylelint": "^15.10.1",
"stylelint-config-standard-scss": "^11.0.0",
"stylelint-config-standard-scss": "^12.0.0",
"typescript": "^5.0.4",
"webpack-dev-server": "^3.11.3",
"yargs": "^17.7.2"