Merge remote-tracking branch 'refs/remotes/misskey-original/develop' into develop
# Conflicts: # README.md # packages/backend/src/core/entities/AbuseUserReportEntityService.ts # packages/frontend/src/pages/admin/moderation.vue
This commit is contained in:
commit
e86e8f6aa6
49 changed files with 466 additions and 178 deletions
|
|
@ -157,6 +157,7 @@ describe('アンテナ', () => {
|
|||
withReplies: false,
|
||||
excludeBots: false,
|
||||
localOnly: false,
|
||||
notify: false,
|
||||
};
|
||||
assert.deepStrictEqual(response, expected);
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue