From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 13 Apr 2017 20:25:07 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila... 
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=41c697fd8190ffef517404b4a4fdef805517166d;p=mastodon.git

Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master
---

41c697fd8190ffef517404b4a4fdef805517166d
diff --cc app/helpers/settings_helper.rb
index c6ffe184e,3162e565f..cf7b9b381
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@@ -7,8 -7,8 +7,9 @@@ module SettingsHelpe
      es: 'Español',
      eo: 'Esperanto',
      fr: 'Français',
+     it: 'Italiano',
      hu: 'Magyar',
 +    nl: 'Nederlands',
      no: 'Norsk',
      pt: 'Português',
      fi: 'Suomi',
diff --cc config/application.rb
index 5a3548d6c,959385802..f5c276862
--- a/config/application.rb
+++ b/config/application.rb
@@@ -32,9 -33,9 +32,10 @@@ module Mastodo
        :es,
        :fi,
        :fr,
+       :it,
        :hu,
        :ja,
 +      :nl,
        :no,
        :pt,
        :ru,