Merge remote-tracking branch 'parent/main' into upstream-20240115
This commit is contained in:
commit
673e09d645
338 changed files with 1095 additions and 540 deletions
|
@ -8,12 +8,11 @@ import { Link, withRouter } from 'react-router-dom';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
|
||||
import { ReactComponent as AlternateEmailIcon } from '@material-symbols/svg-600/outlined/alternate_email.svg';
|
||||
import { ReactComponent as ReferenceIcon } from '@material-symbols/svg-600/outlined/link.svg';
|
||||
import { ReactComponent as EmojiReactionIcon } from '@material-symbols/svg-600/outlined/mood.svg';
|
||||
import { ReactComponent as RepeatIcon } from '@material-symbols/svg-600/outlined/repeat.svg';
|
||||
import { ReactComponent as StarIcon } from '@material-symbols/svg-600/outlined/star-fill.svg';
|
||||
|
||||
import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
|
||||
import ReferenceIcon from 'mastodon/../material-icons/400-24px/link.svg?react';
|
||||
import EmojiReactionIcon from 'mastodon/../material-icons/400-24px/mood.svg?react';
|
||||
import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
|
||||
import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
|
||||
import { AnimatedNumber } from 'mastodon/components/animated_number';
|
||||
import EditedTimestamp from 'mastodon/components/edited_timestamp';
|
||||
import { getHashtagBarForStatus } from 'mastodon/components/hashtag_bar';
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue