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

Merge remote-tracking branch 'parent/main' into kb_migration_development

Browse source
This commit is contained in:
KMY 2023-05-10 09:03:47 +09:00
commit 551a676161
67 changed files with 751 additions and 548 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/components/status.jsx
View file

@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
import { Avatar } from './avatar';
import { AvatarOverlay } from './avatar_overlay';
import { RelativeTimestamp } from './relative_timestamp';
import DisplayName from './display_name';
import { DisplayName } from './display_name';
import StatusContent from './status_content';
import StatusActionBar from './status_action_bar';
import StatusEmojiReactionsBar from './status_emoji_reactions_bar';