mirror of
https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git
synced 2026-01-11 13:33:21 -08:00
Merge commit '01ce9df880' into glitch-soc/merge-upstream
Conflicts: - `tsconfig.json`: Upstream made style fixes, while glitch-soc had extra options. Ported upstream's style fixes.
This commit is contained in:
commit
22cfab0ebf
63 changed files with 291 additions and 88 deletions
|
|
@ -6,7 +6,7 @@
|
|||
"moduleResolution": "node",
|
||||
"noUnusedParameters": false,
|
||||
"tsBuildInfoFile": "../tmp/cache/streaming/tsconfig.tsbuildinfo",
|
||||
"paths": {}
|
||||
"paths": {},
|
||||
},
|
||||
"include": ["./*.js", "./.eslintrc.js"]
|
||||
"include": ["./*.js", "./.eslintrc.js"],
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue