diff options
| author | Matteo Aquila <matteoaquila@users.noreply.github.com> | 2017-04-13 15:33:53 +0200 |
|---|---|---|
| committer | Matteo Aquila <matteoaquila@users.noreply.github.com> | 2017-04-13 15:33:53 +0200 |
| commit | d2c20936f35f140ea4d8600cfac1d452c33acdd2 (patch) | |
| tree | e89960cd54af3d10350c883e0861bbc603bcaf7b | |
| parent | aec2458d81c5d1d66dd4e997793693acf6add4f3 (diff) | |
| parent | 0220f3a171dd0262d4e1a764a2bec88589f7fdd8 (diff) | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | app/helpers/settings_helper.rb | 1 | ||||
| -rw-r--r-- | config/application.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index 212f88c39..66d19e331 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -7,6 +7,7 @@ module SettingsHelper es: 'Español', eo: 'Esperanto', fr: 'Français', + it: 'Italiano' hu: 'Magyar', no: 'Norsk', pt: 'Português', diff --git a/config/application.rb b/config/application.rb index 1383d45a5..959385802 100644 --- a/config/application.rb +++ b/config/application.rb @@ -33,6 +33,7 @@ module Mastodon :es, :fi, :fr, + :it, :hu, :ja, :no, |