diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-06-21 20:49:57 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-06-21 20:49:57 +0200 |
| commit | ab5f450700085ce73621b28b813f2edc5f199785 (patch) | |
| tree | 766214b52ed217903ae821285391f8e2d4b5f545 /app/javascript/mastodon/features/lists/index.js | |
| parent | 26c20a4ec7868753b284670575f28f201a5cef9f (diff) | |
| parent | 7f59206944193591d7aef5cbd73edc7f5303add7 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields
Diffstat (limited to 'app/javascript/mastodon/features/lists/index.js')
| -rw-r--r-- | app/javascript/mastodon/features/lists/index.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/lists/index.js b/app/javascript/mastodon/features/lists/index.js index 28026c434..018e5a9e3 100644 --- a/app/javascript/mastodon/features/lists/index.js +++ b/app/javascript/mastodon/features/lists/index.js @@ -57,7 +57,7 @@ export default class Lists extends ImmutablePureComponent { } return ( - <Column icon='bars' heading={intl.formatMessage(messages.heading)}> + <Column icon='list-ul' heading={intl.formatMessage(messages.heading)}> <ColumnBackButtonSlim /> <NewListForm /> @@ -66,7 +66,7 @@ export default class Lists extends ImmutablePureComponent { <ColumnSubheading text={intl.formatMessage(messages.subheading)} /> {lists.map(list => - <ColumnLink key={list.get('id')} to={`/timelines/list/${list.get('id')}`} icon='bars' text={list.get('title')} /> + <ColumnLink key={list.get('id')} to={`/timelines/list/${list.get('id')}`} icon='list-ul' text={list.get('title')} /> )} </div> </Column> |