Merge remote-tracking branch 'misskey-original/develop' into develop

# Conflicts:
#	packages/frontend/src/components/MkSignupDialog.form.vue
This commit is contained in:
mattyatea 2024-01-06 23:47:45 +09:00
commit eb1ce55304
43 changed files with 1181 additions and 73 deletions

View file

@ -27,6 +27,11 @@ function toolsMenuItems(): MenuItem[] {
to: '/clicker',
text: '●👈',
icon: 'ti ti-cookie',
}, {
type: 'link',
to: '/drop-and-fusion',
text: 'Drop & Fusion',
icon: 'ti ti-apple',
}, ($i && ($i.isAdmin || $i.policies.canManageCustomEmojis)) ? {
type: 'link',
to: '/custom-emojis-manager',