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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

5
app/javascript/mastodon/features/circles/index.jsx
View file

@ -10,9 +10,8 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import { ReactComponent as CirclesIcon } from '@material-symbols/svg-600/outlined/account_circle-fill.svg';
import { ReactComponent as CircleIcon } from '@material-symbols/svg-600/outlined/account_circle.svg';
import CirclesIcon from 'mastodon/../material-icons/400-24px/account_circle-fill.svg?react';
import CircleIcon from 'mastodon/../material-icons/400-24px/account_circle.svg?react';
import { fetchCircles, deleteCircle } from 'mastodon/actions/circles';
import { openModal } from 'mastodon/actions/modal';
import Column from 'mastodon/components/column';