1947a53af6
# 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 |
||
---|---|---|
.. | ||
src | ||
.eslintignore | ||
.eslintrc.cjs | ||
build.js | ||
package.json | ||
tsconfig.json |