Merge remote-tracking branch 'origin/main' into feat/moved-mfa-to-org-level

This commit is contained in:
Sheen Capadngan
2024-10-18 20:07:59 +08:00
94 changed files with 2353 additions and 265 deletions
@@ -157,7 +157,7 @@ export const AdminLayout = ({ children }: LayoutProps) => {
{user?.superAdmin && (
<Link href="/admin" legacyBehavior>
<DropdownMenuItem className="mt-1 border-t border-mineshaft-600">
Admin Panel
Server Admin Console
</DropdownMenuItem>
</Link>
)}
+1 -1
View File
@@ -510,7 +510,7 @@ export const AppLayout = ({ children }: LayoutProps) => {
{user?.superAdmin && (
<Link href="/admin" legacyBehavior>
<DropdownMenuItem className="mt-1 border-t border-mineshaft-600">
Server Admin Panel
Server Admin Console
</DropdownMenuItem>
</Link>
)}