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

diff --cc app/helpers/settings_helper.rb
index c6ffe184ed5e18cd491a58be98a7e9960e611ec3,3162e565fa87ee45a9f4a24f2f62419836633fb6..cf7b9b3819b86daf5e34986017f4946567feb0f6
--- 1/app/helpers/settings_helper.rb
--- 2/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 5a3548d6c986e509e292e59d91820d2ed804e068,95938580223286979d8df03046643cc33e4c08d3..f5c2768624ead59e68025c4590df29d3ce082a2d
--- 1/config/application.rb
--- 2/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,