Merge remote-tracking branch 'parent/main' into upstream-20240118
This commit is contained in:
commit
2b51fabe9c
397 changed files with 2899 additions and 3252 deletions
|
@ -14,8 +14,8 @@ import { connect } from 'react-redux';
|
|||
|
||||
import { HotKeys } from 'react-hotkeys';
|
||||
|
||||
import VisibilityIcon from 'mastodon/../material-icons/400-24px/visibility.svg?react';
|
||||
import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react';
|
||||
import VisibilityIcon from '@/material-icons/400-24px/visibility.svg?react';
|
||||
import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
import { LoadingIndicator } from 'mastodon/components/loading_indicator';
|
||||
import ScrollContainer from 'mastodon/containers/scroll_container';
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue