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

# Conflicts:
#	packages/backend/src/core/QueryService.ts
#	packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts
#	packages/backend/src/server/api/endpoints/hashtags/users.ts
#	packages/backend/src/server/api/endpoints/notes/create.ts
#	packages/frontend/src/pages/emojis.emoji.vue
This commit is contained in:
mattyatea 2024-01-15 23:20:00 +09:00
commit 8205e30311
119 changed files with 12013 additions and 687 deletions

View file

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