merge: upstream

2023-10-31 19:33:24 +01:00
parent c491385f2e bf01c1ee64
commit 4dd23a3793
217 changed files with 6773 additions and 2275 deletions
@@ -129,6 +129,11 @@ const menuDef = $computed(() => [{
 		text: i18n.ts.customEmojis,
 		to: '/admin/emojis',
 		active: currentPage?.route.name === 'emojis',
+	}, {
+		icon: 'ph-sparkle ph-bold ph-lg',
+		text: i18n.ts.avatarDecorations,
+		to: '/avatar-decorations',
+		active: currentPage?.route.name === 'avatarDecorations',
 	}, {
 		icon: 'ph-globe-hemisphere-west ph-bold ph-lg',
 		text: i18n.ts.federation,