constant · b65e2719717a94c68c50feecba982e4137db61fc · phsl / new-api

Merge branch 'main-upstream' into pr/custom-currency-1923 · b65e2719

# Conflicts:
#	web/src/components/settings/personal/cards/AccountManagement.jsx
#	web/src/components/table/channels/modals/EditChannelModal.jsx
#	web/src/hooks/channels/useChannelsData.jsx
#	web/src/hooks/common/useSidebar.js
#	web/src/i18n/locales/fr.json
#	web/src/pages/Setting/Operation/SettingsGeneral.jsx

committed Oct 02, 2025

b65e2719

Name	Last commit	Last Update
..
README.md		Loading commit data...
api_type.go		Loading commit data...
azure.go		Loading commit data...
cache_key.go		Loading commit data...
channel.go		Loading commit data...
context_key.go		Loading commit data...
endpoint_type.go		Loading commit data...
env.go		Loading commit data...
finish_reason.go		Loading commit data...
midjourney.go		Loading commit data...
multi_key_mode.go		Loading commit data...
setup.go		Loading commit data...
task.go		Loading commit data...

README.md