web/src/components/table/channels/modals · 1ffbf8918c52325490c87e2730760b3cfdc9f29f · 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
..
BatchTagModal.jsx		Loading commit data...
ColumnSelectorModal.jsx		Loading commit data...
EditChannelModal.jsx		Loading commit data...
EditTagModal.jsx		Loading commit data...
ModelSelectModal.jsx		Loading commit data...
ModelTestModal.jsx		Loading commit data...
MultiKeyManageModal.jsx		Loading commit data...