merge upstream 2025-02-03

2025-02-03 14:31:26 -05:00 · 2025-02-03 14:31:26 -05:00 · a4e86758c1
commit a4e86758c1
parent 6bc0cd251f 9c70a4e631
264 changed files with 15775 additions and 4919 deletions
--- a/packages/frontend/src/router/definition.ts
+++ b/packages/frontend/src/router/definition.ts
@ -390,6 +390,10 @@ const routes: RouteDef[] = [{
 		path: '/emojis',
 		name: 'emojis',
 		component: page(() => import('@/pages/custom-emojis-manager.vue')),
+	}, {
+		path: '/emojis2',
+		name: 'emojis2',
+		component: page(() => import('@/pages/admin/custom-emojis-manager2.vue')),
 	}, {
 		path: '/avatar-decorations',
 		name: 'avatarDecorations',