merge: upstream (1)

This commit is contained in:
Marie 2024-01-21 13:11:23 +01:00
commit db012fc8c3
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
258 changed files with 18802 additions and 7557 deletions

View file

@ -97,7 +97,7 @@ function onClick(ev: MouseEvent) {
},
}] : []), {
text: i18n.ts.info,
icon: 'ti ti-info-circle',
icon: 'ph-info ph-bold ph-lg',
action: async () => {
os.popup(MkCustomEmojiDetailedDialog, {
emoji: await misskeyApiGet('emoji', {