Merge branch 'develop' into feature/misskey-2024.07

fixing conflicts in `package.json`
2024-08-06 10:35:14 +01:00
parent f0dd0b8993 712af44de4
commit 34c1e9ea2b
12 changed files with 49 additions and 21 deletions
@@ -136,6 +136,7 @@ export interface NoteEventTypes {
 	};
 	replied: {
 		id: MiNote['id'];
+		userId: MiUser['id'];
 	};
 }
 type NoteStreamEventTypes = {