diff options
| author | ThibG <thib@sitedethib.com> | 2019-10-05 18:04:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-05 18:04:36 +0200 |
| commit | 3921125e5578fb3871fdcae0e8e8a77179f1ad72 (patch) | |
| tree | 997c8ed2e7a6b8152266edc0c37ea8264c59d1ab /app/javascript/flavours/glitch/features/ui/components/mute_modal.js | |
| parent | 857c67f31b23b9c496e07eda41755ba449a37f17 (diff) | |
| parent | bc8543d9af0045fe2175f7e2234da9c77dc55023 (diff) | |
Merge pull request #1228 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/ui/components/mute_modal.js')
| -rw-r--r-- | app/javascript/flavours/glitch/features/ui/components/mute_modal.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/ui/components/mute_modal.js b/app/javascript/flavours/glitch/features/ui/components/mute_modal.js index dec6413c3..2aab82751 100644 --- a/app/javascript/flavours/glitch/features/ui/components/mute_modal.js +++ b/app/javascript/flavours/glitch/features/ui/components/mute_modal.js @@ -82,7 +82,7 @@ class MuteModal extends React.PureComponent { <p className='mute-modal__explanation'> <FormattedMessage id='confirmations.mute.explanation' - defaultMessage='This will hide posts from them and posts mentioning them, but it will still allow them to see your posts follow you.' + defaultMessage='This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.' /> </p> <div className='setting-toggle'> |