diff options
| author | ThibG <thib@sitedethib.com> | 2019-02-01 18:24:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-01 18:24:36 +0100 |
| commit | 1cd7b15532f0cbfeec42460be434bbc9a117764d (patch) | |
| tree | c579bf0580d7b027c810ca2abc86dc885c5b5b12 /app/javascript/flavours/glitch/components/account.js | |
| parent | f611da489929d2592b61b0c0f7c870ae33782343 (diff) | |
| parent | 663593b508e419cb1a4f9f93ce75e0065e0833d4 (diff) | |
Merge pull request #904 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/components/account.js')
| -rw-r--r-- | app/javascript/flavours/glitch/components/account.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/components/account.js b/app/javascript/flavours/glitch/components/account.js index 072c601e0..4fcafc509 100644 --- a/app/javascript/flavours/glitch/components/account.js +++ b/app/javascript/flavours/glitch/components/account.js @@ -85,7 +85,7 @@ export default class Account extends ImmutablePureComponent { if (requested) { buttons = <IconButton disabled icon='hourglass' title={intl.formatMessage(messages.requested)} />; } else if (blocking) { - buttons = <IconButton active icon='unlock-alt' title={intl.formatMessage(messages.unblock, { name: account.get('username') })} onClick={this.handleBlock} />; + buttons = <IconButton active icon='unlock' title={intl.formatMessage(messages.unblock, { name: account.get('username') })} onClick={this.handleBlock} />; } else if (muting) { let hidingNotificationsButton; if (account.getIn(['relationship', 'muting_notifications'])) { |