xinyin025/ChatGPT-Next-Web
1
0
Fork 0
mirror of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git synced 2025-11-17 22:43:42 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	app/api/google/[...path]/route.ts
#	app/client/platforms/google.ts
#	app/constant.ts
#	app/store/prompt.ts
#	app/utils/hooks.ts
#	public/prompts.json
This commit is contained in:
sijinhui
2024-07-19 12:56:46 +08:00
parent 217629b532 afa1a4303b
commit 35532f8781
12 changed files with 308 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/store/chat.ts
View File

@@ -9,8 +9,6 @@ import {
DEFAULT_MODELS,
DEFAULT_SYSTEM_TEMPLATE,
KnowledgeCutOffDate,
ServiceProvider,
ModelProvider,
StoreKey,
SUMMARIZE_MODEL,
GEMINI_SUMMARIZE_MODEL,