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

Merge remote-tracking branch 'parent/main' into upstream-20231021

Browse source
This commit is contained in:
KMY 2023-10-23 18:48:26 +09:00
commit 46a1e62dc4
37 changed files with 154 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/features/account_timeline/components/limited_account_hint.jsx
View file

@ -6,7 +6,7 @@ import { FormattedMessage } from 'react-intl';
import { connect } from 'react-redux';
import { revealAccount } from 'mastodon/actions/accounts';
import Button from 'mastodon/components/button';
import { Button } from 'mastodon/components/button';
import { domain } from 'mastodon/initial_state';
const mapDispatchToProps = (dispatch, { accountId }) => ({