diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-13 13:26:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-13 13:26:16 +0200 |
| commit | 1a12fd14d438380e24421e9c8a8894cc705aba51 (patch) | |
| tree | b276d81e18839706eaebe1db5870edc0b8628064 /app/assets/javascripts/components/features/public_timeline/index.jsx | |
| parent | a18fd491b9ad9b2e1677d0e0355712a08967fe14 (diff) | |
| parent | 282bb55c3cae07229d4c9a2fe58c1c2a136c57b9 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'app/assets/javascripts/components/features/public_timeline/index.jsx')
| -rw-r--r-- | app/assets/javascripts/components/features/public_timeline/index.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/features/public_timeline/index.jsx b/app/assets/javascripts/components/features/public_timeline/index.jsx index 6d766a83b..a7ac95ab4 100644 --- a/app/assets/javascripts/components/features/public_timeline/index.jsx +++ b/app/assets/javascripts/components/features/public_timeline/index.jsx @@ -14,7 +14,7 @@ import ColumnBackButtonSlim from '../../components/column_back_button_slim'; import createStream from '../../stream'; const messages = defineMessages({ - title: { id: 'column.public', defaultMessage: 'Whole Known Network' } + title: { id: 'column.public', defaultMessage: 'Federated timeline' } }); const mapStateToProps = state => ({ |