Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts: # package.json # packages/backend/src/server/api/stream/ChannelsService.ts # packages/frontend/src/components/MkPostForm.vue # packages/frontend/src/pages/custom-emojis-manager.vue # packages/frontend/src/pages/settings/mute-block.vue
This commit is contained in:
commit
d19a4ab8a3
208 changed files with 1404 additions and 740 deletions
|
|
@ -13,6 +13,7 @@ export const meta = {
|
|||
tags: ['role'],
|
||||
|
||||
requireCredential: true,
|
||||
kind: 'read:account',
|
||||
|
||||
res: {
|
||||
type: 'array',
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ export const meta = {
|
|||
tags: ['role', 'notes'],
|
||||
|
||||
requireCredential: true,
|
||||
kind: 'read:account',
|
||||
|
||||
errors: {
|
||||
noSuchRole: {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue