Merge commit 'cd37048439' into glitch-soc/merge-upstream

Conflicts:
- `.prettierignore`:
  Conflict due to glitch-soc-only files.
  Kept those at the end of the file.
This commit is contained in:
Claire 2024-01-13 12:11:29 +01:00
commit a3b6a85521
64 changed files with 231 additions and 65 deletions

View file

@ -10,6 +10,8 @@
"esModuleInterop": true,
"skipLibCheck": true,
"baseUrl": "./",
"incremental": true,
"tsBuildInfoFile": "tmp/cache/tsconfig.tsbuildinfo",
"paths": {
"locales": ["app/javascript/locales"],
"styles/*": ["app/javascript/styles/*"],