Merge remote-tracking branch 'upstream/master' into twitch-tokens-real

Monkestation · Dec 15, 2023 · b40d2aa · b40d2aa
2 parents f0991f5 + dd7fc3a
commit b40d2aa
Show file tree

Hide file tree

Showing 947 changed files with 22,947 additions and 10,331 deletions.
diff --git a/.gitignore b/.gitignore
@@ -236,3 +236,4 @@ define_sanity_output.txt
 
 #This file contains developer-specific config overrides. These shouldn't be committed.
 config/_config_nogit.txt
+config/dbconfig.txt
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -9,7 +9,7 @@
 		"**/.pnp.*": true
 	},
 	"editor.codeActionsOnSave": {
-		"source.fixAll.eslint": true
+		"source.fixAll.eslint": "explicit"
 	},
 	"files.eol": "\n",
 	"files.insertFinalNewline": true,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -236,3 +236,4 @@ define_sanity_output.txt

		#This file contains developer-specific config overrides. These shouldn't be committed.
		config/_config_nogit.txt
		config/dbconfig.txt