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

Merge remote-tracking branch 'parent/main' into upstream-20240118

Browse source
This commit is contained in:
KMY 2024-01-18 09:17:39 +09:00
commit 2b51fabe9c
397 changed files with 2899 additions and 3252 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,14 +9,14 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { HotKeys } from 'react-hotkeys';
import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
import QuoteIcon from 'mastodon/../material-icons/400-24px/format_quote.svg?react';
import ReferenceIcon from 'mastodon/../material-icons/400-24px/link.svg?react';
import PushPinIcon from 'mastodon/../material-icons/400-24px/push_pin.svg?react';
import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
import LimitedIcon from 'mastodon/../material-icons/400-24px/shield.svg?react';
import TimerIcon from 'mastodon/../material-icons/400-24px/timer.svg?react';
import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
import QuoteIcon from '@/material-icons/400-24px/format_quote.svg?react';
import ReferenceIcon from '@/material-icons/400-24px/link.svg?react';
import PushPinIcon from '@/material-icons/400-24px/push_pin.svg?react';
import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
import LimitedIcon from '@/material-icons/400-24px/shield.svg?react';
import TimerIcon from '@/material-icons/400-24px/timer.svg?react';
import AttachmentList from 'mastodon/components/attachment_list';
import { Icon } from 'mastodon/components/icon';
import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder';