Merge remote-tracking branch 'origin/master'

This commit is contained in:
Matteo Aquila 2017-04-13 15:33:53 +02:00
commit d2c20936f3
2 changed files with 2 additions and 0 deletions

View File

@ -7,6 +7,7 @@ module SettingsHelper
es: 'Español',
eo: 'Esperanto',
fr: 'Français',
it: 'Italiano'
hu: 'Magyar',
no: 'Norsk',
pt: 'Português',

View File

@ -33,6 +33,7 @@ module Mastodon
:es,
:fi,
:fr,
:it,
:hu,
:ja,
:no,