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/features/status/components/detailed_status.jsx
View file

@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { Avatar } from '../../../components/avatar';
import DisplayName from '../../../components/display_name';
import { DisplayName } from '../../../components/display_name';
import StatusContent from '../../../components/status_content';
import StatusEmojiReactionsBar from '../../../components/status_emoji_reactions_bar';
import MediaGallery from '../../../components/media_gallery';