Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream

This commit is contained in:
Claire
2024-01-16 12:04:11 +01:00
110 changed files with 255 additions and 251 deletions

View File

@@ -10,7 +10,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { length } from 'stringz';
import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
import LockIcon from '@/material-icons/400-24px/lock.svg?react';
import { Icon } from 'mastodon/components/icon';
import { WithOptionalRouterPropTypes, withOptionalRouter } from 'mastodon/utils/react_router';