mirror/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon synced 2024-11-25 15:46:24 +09:00
Code

Merge remote-tracking branch 'origin/master'

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/helpers/settings_helper.rb
View File

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

1
config/application.rb
View File

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