Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
# Conflicts:
#	package.json
This commit is contained in:
mattyatea 2023-09-15 14:49:25 +09:00
commit 5a06039153
451 changed files with 2638 additions and 2691 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/backend/src/server/api/stream/channels/user-list.ts
View file

@ -4,7 +4,7 @@
*/
import { Inject, Injectable } from '@nestjs/common';
import type { UserListJoiningsRepository, UserListsRepository } from '@/models/index.js';
import type { UserListJoiningsRepository, UserListsRepository } from '@/models/_.js';
import type { MiUser } from '@/models/entities/User.js';
import { isUserRelated } from '@/misc/is-user-related.js';
import type { Packed } from '@/misc/json-schema.js';