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

3
app/javascript/mastodon/features/keyboard_shortcuts/index.jsx
View file

@ -6,8 +6,7 @@ import { Helmet } from 'react-helmet';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { ReactComponent as InfoIcon } from '@material-symbols/svg-600/outlined/info.svg';
import InfoIcon from 'mastodon/../material-icons/400-24px/info.svg?react';
import Column from 'mastodon/components/column';
import ColumnHeader from 'mastodon/components/column_header';