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

Merge remote-tracking branch 'misskey-dev/develop' into io

Browse source
This commit is contained in:
まっちゃとーにゅ 2024-05-09 00:21:37 +09:00
commit f2743a09e2
No known key found for this signature in database
GPG key ID: 143DE582A97FE052
23 changed files with 1001 additions and 1106 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -423,7 +423,7 @@ async function assignRole() {
if (canceled) return;
const { canceled: canceled2, result: period } = await os.select({
title: i18n.ts.period,
title: i18n.ts.period + ': ' + roles.find(r => r.id === roleId)!.name,
items: [{
value: 'indefinitely', text: i18n.ts.indefinitely,
}, {