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

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

Browse source
This commit is contained in:
KMY 2024-02-27 08:53:15 +09:00
commit 78446fead4
120 changed files with 499 additions and 373 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/features/ui/components/navigation_panel.jsx
View file

@ -74,7 +74,7 @@ class NavigationPanel extends Component {
const { signedIn, disabledAccountId } = this.context.identity;
const explorer = (trendsEnabled ? (
<ColumnLink transparent to='/explore' icon='hashtag' iconComponent={ExploreIcon} text={intl.formatMessage(messages.explore)} />
<ColumnLink transparent to='/explore' icon='explore' iconComponent={ExploreIcon} text={intl.formatMessage(messages.explore)} />
) : (
<ColumnLink transparent to='/search' icon='search' iconComponent={SearchIcon} text={intl.formatMessage(messages.search)} />
));