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

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

Browse source 
# Conflicts:
#	packages/frontend/src/components/MkAbuseReport.vue
This commit is contained in:
mattyatea 2024-02-19 22:05:40 +09:00
commit cc69717f0d
28 changed files with 163 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/backend/src/server/api/endpoints/admin/roles/users.ts
View file

@ -17,7 +17,7 @@ export const meta = {
tags: ['admin', 'role', 'users'],
requireCredential: false,
requireAdmin: true,
requireModerator: true,
kind: 'read:admin:roles',
errors: {