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-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/explore/index.jsx
View file

@ -58,7 +58,7 @@ class Explore extends PureComponent {
return (
<Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.title)}>
<ColumnHeader
icon={isSearching ? 'search' : 'hashtag'}
icon={isSearching ? 'search' : 'explore'}
iconComponent={isSearching ? SearchIcon : ExploreIcon}
title={intl.formatMessage(isSearching ? messages.searchResults : messages.title)}
onClick={this.handleHeaderClick}