gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge commit '25c66fa640' into kb_migration

Browse source
This commit is contained in:
KMY 2023-06-13 18:34:49 +09:00
commit 1f64358afb
107 changed files with 2159 additions and 1540 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/features/account/components/header.jsx
View file

@ -377,7 +377,7 @@ class Header extends ImmutablePureComponent {
let badge;
if (account.get('bot')) {
badge = (<div className='account-role bot'><FormattedMessage id='account.badges.bot' defaultMessage='Bot' /></div>);
badge = (<div className='account-role bot'><FormattedMessage id='account.badges.bot' defaultMessage='Automated' /></div>);
} else if (account.get('group')) {
badge = (<div className='account-role group'><FormattedMessage id='account.badges.group' defaultMessage='Group' /></div>);
} else {