balkan/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Merge commit 'c8181eb0a4' into kb_migration

Browse source
This commit is contained in:
KMY 2023-05-09 15:39:21 +09:00
commit ba3f60ba63
153 changed files with 426 additions and 366 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,9 +1,9 @@
import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import Avatar from './avatar';
import AvatarOverlay from './avatar_overlay';
import RelativeTimestamp from './relative_timestamp';
import { Avatar } from './avatar';
import { AvatarOverlay } from './avatar_overlay';
import { RelativeTimestamp } from './relative_timestamp';
import DisplayName from './display_name';
import StatusContent from './status_content';
import StatusActionBar from './status_action_bar';
@ -15,7 +15,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { MediaGallery, Video, Audio } from '../features/ui/util/async-components';
import { HotKeys } from 'react-hotkeys';
import classNames from 'classnames';
import Icon from 'mastodon/components/icon';
import { Icon } from 'mastodon/components/icon';
import { displayMedia } from '../initial_state';
import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder';