Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' 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 files changed
+291
-88
No files matched your search
@@ -6,7 +6,7 @@
|
||||
"moduleResolution": "node",
|
||||
"noUnusedParameters": false,
|
||||
"tsBuildInfoFile": "../tmp/cache/streaming/tsconfig.tsbuildinfo",
|
||||
"paths": {}
|
||||
"paths": {},
|
||||
},
|
||||
"include": ["./*.js", "./.eslintrc.js"]
|
||||
"include": ["./*.js", "./.eslintrc.js"],
|
||||
}
|
||||
Reference in new issue
Block a user