mirror of
https://github.com/misskey-dev/misskey.git
synced 2026-03-23 20:43:38 +00:00
eacb74cb44
# Conflicts: # locales/index.d.ts # locales/ja-JP.yml # package.json # packages/backend/src/core/entities/NoteEntityService.ts # packages/backend/src/models/Note.ts # packages/backend/src/server/api/endpoints/roles/notes.ts # packages/backend/src/server/api/stream/channels/global-timeline.ts # packages/backend/src/server/api/stream/channels/home-timeline.ts # packages/backend/src/server/api/stream/channels/hybrid-timeline.ts # packages/backend/src/server/api/stream/channels/local-timeline.ts # packages/frontend/src/components/MkFollowButton.vue # packages/frontend/src/pages/settings/general.vue # packages/frontend/src/pages/timeline.vue # packages/frontend/src/pages/user/home.vue # packages/frontend/src/store.ts