mattyatea 68b48bc16f Merge remote-tracking branch 'misskey-mattyatea/emoji-request' into develop ...

# Conflicts:
#	CHANGELOG.md
#	locales/index.d.ts
#	locales/ja-JP.yml
#	packages/backend/src/core/CustomEmojiService.ts
#	packages/backend/src/models/RepositoryModule.ts
#	packages/backend/src/server/api/EndpointsModule.ts
#	packages/backend/src/server/api/endpoints.ts
#	packages/backend/src/server/api/endpoints/admin/emoji/update.ts
#	packages/frontend/src/components/MkCustomEmojiEditLocal.vue
#	packages/frontend/src/components/MkCustomEmojiEditRemote.vue
#	packages/frontend/src/components/MkEmojiEditDialog.vue
#	packages/frontend/src/pages/about.emojis.vue
#	packages/frontend/src/pages/admin/roles.editor.vue
#	packages/frontend/src/pages/custom-emojis-manager.vue
#	packages/frontend/src/pages/emojis.emoji.vue

2023-12-23 09:30:48 +09:00

..

backend

Merge remote-tracking branch 'misskey-mattyatea/emoji-request' into develop

2023-12-23 09:30:48 +09:00

frontend

Merge remote-tracking branch 'misskey-mattyatea/emoji-request' into develop

2023-12-23 09:30:48 +09:00

misskey-js

enhance: ロールにアサインされたときの通知 (#12607)

2023-12-21 10:39:11 +09:00

shared

Update .eslintrc.js

2023-10-31 20:14:36 +09:00

sw

update deps

2023-12-18 13:14:58 +09:00

meta.json

…