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

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

View file

@ -7,8 +7,8 @@ import { Link, withRouter } from 'react-router-dom';
import { connect } from 'react-redux';
import RefreshIcon from 'mastodon/../material-icons/400-24px/refresh.svg?react';
import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
import RefreshIcon from '@/material-icons/400-24px/refresh.svg?react';
import SearchIcon from '@/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';