oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

Merge tag '2023.12.0-beta.6' into merge-upstream

Browse source
This commit is contained in:
riku6460 2023-12-21 11:56:34 +09:00
commit b3de794bdd
No known key found for this signature in database
GPG key ID: 27414FA27DB94CF6
251 changed files with 2328 additions and 1176 deletions
Download patch file Download diff file Expand all files Collapse all files

4
packages/frontend/src/pages/admin-user.vue
View file

@ -221,12 +221,12 @@ import MkFileListForAdmin from '@/components/MkFileListForAdmin.vue';
import MkInfo from '@/components/MkInfo.vue';
import * as os from '@/os.js';
import { url } from '@/config.js';
import { userPage, acct } from '@/filters/user.js';
import { acct } from '@/filters/user.js';
import { definePageMetadata } from '@/scripts/page-metadata.js';
import { i18n } from '@/i18n.js';
import { iAmAdmin, iAmModerator, $i } from '@/account.js';
import MkRolePreview from '@/components/MkRolePreview.vue';
import MkPagination, { Paging } from '@/components/MkPagination.vue';
import MkPagination from '@/components/MkPagination.vue';
const props = withDefaults(defineProps<{
userId: string;