mattyatea eacb74cb44 Merge remote-tracking branch 'misskey-original/develop' into develop ...

# 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

2023-10-18 21:22:51 +09:00

..

backend

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

2023-10-18 21:22:51 +09:00

frontend

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

2023-10-18 21:22:51 +09:00

misskey-js

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

2023-10-18 21:22:51 +09:00

shared

fix(backend): ダイレクト投稿がタイムライン上に正常に表示されない問題を修正 (#11993)

2023-10-09 12:36:25 +09:00

sw

update deps

2023-10-17 09:04:17 +09:00

meta.json

…