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

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

@ -10,8 +10,8 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
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 CirclesIcon from '@/material-icons/400-24px/account_circle-fill.svg?react';
import CircleIcon from '@/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';