ChatGPT-Next-Web/app/client
sijinhui 8d28155c86 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/locales/ar.ts
#	app/locales/bn.ts
#	app/locales/cs.ts
#	app/locales/de.ts
#	app/locales/es.ts
#	app/locales/fr.ts
#	app/locales/id.ts
#	app/locales/it.ts
#	app/locales/jp.ts
#	app/locales/ko.ts
#	app/locales/no.ts
#	app/locales/pt.ts
#	app/locales/ru.ts
#	app/locales/sk.ts
#	app/locales/tr.ts
#	app/locales/vi.ts
#	app/store/chat.ts
#	app/store/config.ts
2024-09-14 15:37:19 +08:00
..
platforms Merge remote-tracking branch 'upstream/main' into dev 2024-09-14 15:37:19 +08:00
api.ts Merge remote-tracking branch 'upstream/main' into dev 2024-09-07 19:00:38 +08:00
controller.ts feat: add multi-model support 2023-10-30 02:07:11 +08:00