mattyatea 1947a53af6 Merge remote-tracking branch 'misskey-original/develop' into develop ... # Conflicts: # README.md # locales/en-US.yml # locales/index.d.ts # locales/ja-JP.yml # package.json # packages/backend/src/core/CustomEmojiService.ts # packages/backend/src/core/NoteCreateService.ts # packages/backend/src/core/RoleService.ts # packages/backend/src/core/activitypub/models/ApNoteService.ts # packages/backend/src/core/activitypub/models/ApPersonService.ts # packages/backend/src/server/api/endpoints/admin/emoji/update.ts # packages/frontend/src/components/MkDialog.vue # packages/frontend/src/components/MkEmojiPicker.section.vue # packages/frontend/src/components/MkEmojiPicker.vue # packages/frontend/src/components/global/MkCustomEmoji.vue # packages/frontend/src/const.ts # packages/frontend/src/os.ts # packages/frontend/src/pages/admin/roles.editor.vue # packages/frontend/src/pages/admin/roles.vue # packages/frontend/src/pages/admin/security.vue # pnpm-lock.yaml		2024-03-05 16:38:19 +09:00
..
backend	Merge remote-tracking branch 'misskey-original/develop' into develop	2024-03-05 16:38:19 +09:00
cherrypick-js/src	fix	2024-02-13 13:29:10 +09:00
frontend	Merge remote-tracking branch 'misskey-original/develop' into develop	2024-03-05 16:38:19 +09:00
misskey-bubble-game	Merge remote-tracking branch 'misskey-original/develop' into develop	2024-03-05 16:38:19 +09:00
misskey-js	Merge remote-tracking branch 'misskey-original/develop' into develop	2024-03-05 16:38:19 +09:00
misskey-reversi	update deps	2024-03-01 13:52:39 +09:00
shared	chore: use @misskey-dev/eslint-plugin (#12860)	2023-12-31 15:26:57 +09:00
sw	update deps	2024-03-01 13:52:39 +09:00
meta.json