Merge remote-tracking branch 'origin/master'

2024-12-23 01:25:36 +00:00 · 2017-04-13 15:33:53 +02:00 · 2017-04-13 15:33:53 +02:00 · d2c20936f3
parent aec2458d81 0220f3a171
commit d2c20936f3
2 changed files with 2 additions and 0 deletions
--- 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',
--- a/config/application.rb
+++ b/config/application.rb
@ -33,6 +33,7 @@ module Mastodon
      :es,
      :fi,
      :fr,
+      :it,
      :hu,
      :ja,
      :no,