Merge branch 'main' into feat/proxy-server

# Conflicts:
#	src/components/settings/SettingsPage.tsx
This commit is contained in:
YoVinchen
2025-12-03 22:19:44 +08:00
+1 -1
View File
@@ -165,7 +165,7 @@ export function SettingsPage({
onValueChange={setActiveTab}
className="flex flex-col h-full"
>
<TabsList className="grid w-full grid-cols-4 mb-6 glass rounded-xl">
<TabsList className="grid w-full grid-cols-4 mb-6 glass rounded-lg">
<TabsTrigger value="general">
{t("settings.tabGeneral")}
</TabsTrigger>