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

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
app/javascript/mastodon/features/compose/components
expiration_dropdown.jsx

2
app/javascript/mastodon/features/compose/components/expiration_dropdown.jsx
View file

@ -8,7 +8,7 @@ import classNames from 'classnames';
import { supportsPassiveEvents } from 'detect-passive-events';
import Overlay from 'react-overlays/Overlay';
import TimerIcon from 'mastodon/../material-icons/400-24px/timer.svg?react';
import TimerIcon from '@/material-icons/400-24px/timer.svg?react';
import { IconButton } from '../../../components/icon_button';