Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream

This commit is contained in:
Claire committed 2024-01-15 20:27:41 +01:00
commit 2f521bc84a
275 files changed
+867 -435

No files matched your search

@@ -8,9 +8,9 @@ import classNames from 'classnames';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import LockIcon from '@material-symbols/svg-600/outlined/lock.svg?react';
import { length } from 'stringz';
import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
import { Icon } from 'mastodon/components/icon';
import { WithOptionalRouterPropTypes, withOptionalRouter } from 'mastodon/utils/react_router';