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

Browse source
This commit is contained in:
KMY 2023-08-15 18:26:46 +09:00
commit 4ebf500e55
6 changed files with 82 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/javascript/mastodon/features/status/components/detailed_status.jsx
View file

@ -10,6 +10,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { AnimatedNumber } from 'mastodon/components/animated_number';
import EditedTimestamp from 'mastodon/components/edited_timestamp';
import { HashtagBar } from 'mastodon/components/hashtag_bar';
import { Icon } from 'mastodon/components/icon';
import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder';
@ -389,6 +390,8 @@ class DetailedStatus extends ImmutablePureComponent {
{media}
<HashtagBar hashtags={status.get('tags')} text={status.get('content')} />
{emojiReactionsBar}
<div className='detailed-status__meta'>