diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:23:50 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:23:50 -0400 |
commit | 7632178300705bead8547284729fd50d038741b9 (patch) | |
tree | 881b0aef00eb6c558aaaae8cd66e4166bff5b031 /app/assets/javascripts/components/containers/mastodon.jsx | |
parent | d025c5e59306bed05aad4ebc52c541c34cf43d94 (diff) | |
parent | e4e948a21b748a30035392b249b3ee705ed86a91 (diff) |
Merge branch 'master' into patch-1
Diffstat (limited to 'app/assets/javascripts/components/containers/mastodon.jsx')
-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({ |