diff options
| author | ThibG <thib@sitedethib.com> | 2018-09-21 08:39:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-21 08:39:07 +0200 |
| commit | 17464c10ad1693095a05fe445587804589d627e1 (patch) | |
| tree | ecd2a077b038b864ac7912cba72dd59990fb6258 /app/javascript/mastodon/components/relative_timestamp.js | |
| parent | 382cdd7f959480d59fee5646be320d6076cb18d8 (diff) | |
| parent | 343acd96cccb16b1ecdc3a52a8733359d4a92633 (diff) | |
Merge pull request #739 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/mastodon/components/relative_timestamp.js')
| -rw-r--r-- | app/javascript/mastodon/components/relative_timestamp.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/components/relative_timestamp.js b/app/javascript/mastodon/components/relative_timestamp.js index 9609714a1..57d99dd19 100644 --- a/app/javascript/mastodon/components/relative_timestamp.js +++ b/app/javascript/mastodon/components/relative_timestamp.js @@ -86,8 +86,8 @@ export const timeAgoString = (intl, date, now, year) => { return relativeTime; }; -@injectIntl -export default class RelativeTimestamp extends React.Component { +export default @injectIntl +class RelativeTimestamp extends React.Component { static propTypes = { intl: PropTypes.object.isRequired, |