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

This commit is contained in:
KMY 2024-01-15 11:08:37 +09:00
commit 673e09d645
338 changed files with 1095 additions and 540 deletions

View file

@ -7,9 +7,8 @@ import { Link, withRouter } from 'react-router-dom';
import { connect } from 'react-redux';
import { ReactComponent as RefreshIcon } from '@material-symbols/svg-600/outlined/refresh.svg';
import { ReactComponent as SearchIcon } from '@material-symbols/svg-600/outlined/search.svg';
import RefreshIcon from 'mastodon/../material-icons/400-24px/refresh.svg?react';
import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
import { openModal } from 'mastodon/actions/modal';
import { fetchServer } from 'mastodon/actions/server';
import { Avatar } from 'mastodon/components/avatar';