Merge remote-tracking branch 'upstream/main' into dev

# Conflicts:
#	.github/workflows/deploy_preview.yml
#	app/client/api.ts
#	app/client/platforms/google.ts
#	app/store/chat.ts
This commit is contained in:
sijinhui
2024-02-08 21:29:22 +08:00
18 changed files with 751 additions and 156 deletions

View File

@@ -1,5 +1,5 @@
{
"name": "chatgpt-next-web",
"name": "nextchat",
"private": false,
"license": "mit",
"scripts": {
@@ -85,4 +85,4 @@
"resolutions": {
"lint-staged/yaml": "^2.2.2"
}
}
}