mirror of
https://github.com/siteboon/claudecodeui.git
synced 2026-06-18 22:57:31 +08:00
Merge remote-tracking branch 'origin/main' into electron-app
# Conflicts: # package-lock.json # package.json # server/index.js # src/components/main-content/types/types.ts # src/components/main-content/view/MainContent.tsx # src/components/main-content/view/subcomponents/MainContentHeader.tsx # src/components/main-content/view/subcomponents/MainContentTabSwitcher.tsx # src/components/main-content/view/subcomponents/MainContentTitle.tsx # src/components/settings/hooks/useSettingsController.ts # src/components/settings/types/types.ts # src/components/settings/view/Settings.tsx # src/components/settings/view/SettingsSidebar.tsx # src/hooks/useProjectsState.ts # src/i18n/locales/de/common.json # src/i18n/locales/en/common.json # src/i18n/locales/en/settings.json # src/i18n/locales/it/common.json # src/i18n/locales/ja/common.json # src/i18n/locales/ko/common.json # src/i18n/locales/ru/common.json # src/i18n/locales/tr/common.json # src/i18n/locales/zh-CN/common.json # src/i18n/locales/zh-TW/common.json # src/types/app.ts
This commit is contained in:
Simos Mikelatos