diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-04-09 11:40:14 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-04-09 11:45:08 +0200 |
| commit | ce12934f5b1804cc144014d9d0a93fdd16d13bf1 (patch) | |
| tree | e6cb0c166392c28b38d86abe8f27344ce1d7752f /app/javascript/mastodon/features/list_timeline/index.jsx | |
| parent | ff168ef2024626f37fa776fde5739dcd58ecb9f2 (diff) | |
| parent | 99e3e152cd2180cfa9a5bcafae208d44f31078f8 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `package.json`: Upstream removed a dependency that was textually close to a glitch-soc-only dependency. Removed the dependency as upstream did, while keeping the glitch-soc-only dependency.
Diffstat (limited to 'app/javascript/mastodon/features/list_timeline/index.jsx')
| -rw-r--r-- | app/javascript/mastodon/features/list_timeline/index.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/list_timeline/index.jsx b/app/javascript/mastodon/features/list_timeline/index.jsx index d0ba2a186..c0b9a62ff 100644 --- a/app/javascript/mastodon/features/list_timeline/index.jsx +++ b/app/javascript/mastodon/features/list_timeline/index.jsx @@ -176,11 +176,11 @@ class ListTimeline extends React.PureComponent { multiColumn={multiColumn} > <div className='column-settings__row column-header__links'> - <button type='button' className='text-btn column-header__setting-btn' tabIndex='0' onClick={this.handleEditClick}> + <button type='button' className='text-btn column-header__setting-btn' tabIndex={0} onClick={this.handleEditClick}> <Icon id='pencil' /> <FormattedMessage id='lists.edit' defaultMessage='Edit list' /> </button> - <button type='button' className='text-btn column-header__setting-btn' tabIndex='0' onClick={this.handleDeleteClick}> + <button type='button' className='text-btn column-header__setting-btn' tabIndex={0} onClick={this.handleDeleteClick}> <Icon id='trash' /> <FormattedMessage id='lists.delete' defaultMessage='Delete list' /> </button> </div> |