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

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

View file

@ -7,7 +7,7 @@ import Button from '../../../components/button';
import StatusContent from '../../../components/status_content';
import { Avatar } from '../../../components/avatar';
import { RelativeTimestamp } from '../../../components/relative_timestamp';
import DisplayName from '../../../components/display_name';
import { DisplayName } from '../../../components/display_name';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { Icon } from 'mastodon/components/icon';
import AttachmentList from 'mastodon/components/attachment_list';