Merge branch 'develop' into feature/misskey-2024.07
fixing conflicts in `package.json`
No related branches found
No related tags found
Showing
- package.json 1 addition, 1 deletionpackage.json
- packages/backend/src/boot/master.ts 9 additions, 1 deletionpackages/backend/src/boot/master.ts
- packages/backend/src/config.ts 17 additions, 8 deletionspackages/backend/src/config.ts
- packages/backend/src/core/GlobalEventService.ts 1 addition, 0 deletionspackages/backend/src/core/GlobalEventService.ts
- packages/backend/src/core/NoteCreateService.ts 1 addition, 0 deletionspackages/backend/src/core/NoteCreateService.ts
- packages/backend/src/core/activitypub/models/ApImageService.ts 1 addition, 1 deletion...ges/backend/src/core/activitypub/models/ApImageService.ts
- packages/backend/src/core/entities/InstanceEntityService.ts 2 additions, 1 deletionpackages/backend/src/core/entities/InstanceEntityService.ts
- packages/backend/src/postgres.ts 1 addition, 5 deletionspackages/backend/src/postgres.ts
- packages/backend/src/server/api/endpoints/federation/instances.ts 1 addition, 1 deletion.../backend/src/server/api/endpoints/federation/instances.ts
- packages/backend/src/server/api/endpoints/federation/stats.ts 2 additions, 2 deletions...ages/backend/src/server/api/endpoints/federation/stats.ts
- packages/backend/src/server/api/stream/Connection.ts 12 additions, 0 deletionspackages/backend/src/server/api/stream/Connection.ts
- packages/frontend/src/components/MkNote.vue 1 addition, 1 deletionpackages/frontend/src/components/MkNote.vue
Loading
Please register or sign in to comment