diff options
author | ThibG <thib@sitedethib.com> | 2019-03-13 23:44:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-13 23:44:37 +0100 |
commit | fa75324059c7a146354470691888dc0e1de0342f (patch) | |
tree | 2f4a582a05b6ef7b001140871bf2e2bea7771d95 /app/javascript/flavours/glitch/components | |
parent | 3005e473a0df4d2ea942dcc33e01c5e4c15b81fa (diff) | |
parent | 931ecc8824e81c4dcaeb900290c09145b4ed7351 (diff) |
Merge pull request #958 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/components')
-rw-r--r-- | app/javascript/flavours/glitch/components/status_prepend.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/components/status_prepend.js b/app/javascript/flavours/glitch/components/status_prepend.js index d1a7c5833..481e6644e 100644 --- a/app/javascript/flavours/glitch/components/status_prepend.js +++ b/app/javascript/flavours/glitch/components/status_prepend.js @@ -66,7 +66,7 @@ export default class StatusPrepend extends React.PureComponent { return ( <FormattedMessage id='notification.poll' - defaultMessage='Your poll has ended' + defaultMessage='A poll you have voted in has ended' /> ); } |