diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:43:13 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:43:13 -0400 |
commit | 38c51309300790e0f4a3fed0ede387c1765633a6 (patch) | |
tree | 5fc14c684d9ee4b21eb7710c491b3573df6e0034 /app/assets/javascripts/components/containers | |
parent | b5d87500d2600eb8a0a56b0caeca5c7be388df19 (diff) | |
parent | ee8af9083ae83c6c642fa00aff040fb971f13470 (diff) |
Merge branch 'master' into master
Diffstat (limited to 'app/assets/javascripts/components/containers')
-rw-r--r-- | app/assets/javascripts/components/containers/mastodon.jsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/containers/mastodon.jsx b/app/assets/javascripts/components/containers/mastodon.jsx index cbb7b85bc..00f20074d 100644 --- a/app/assets/javascripts/components/containers/mastodon.jsx +++ b/app/assets/javascripts/components/containers/mastodon.jsx @@ -47,6 +47,7 @@ import pt from 'react-intl/locale-data/pt'; import hu from 'react-intl/locale-data/hu'; import uk from 'react-intl/locale-data/uk'; import fi from 'react-intl/locale-data/fi'; +import eo from 'react-intl/locale-data/eo'; import getMessagesForLocale from '../locales'; import { hydrateStore } from '../actions/store'; import createStream from '../stream'; @@ -59,7 +60,7 @@ const browserHistory = useRouterHistory(createBrowserHistory)({ basename: '/web' }); -addLocaleData([...en, ...de, ...es, ...fr, ...pt, ...hu, ...uk, ...fi]); +addLocaleData([...en, ...de, ...es, ...fr, ...pt, ...hu, ...uk, ...fi, ...eo]); const Mastodon = React.createClass({ |