Merge remote-tracking branch 'origin/develop' into develop

* origin/develop: changing encoding for italian files
AsgardCms · Jun 9, 2015 · 1304c02 · 1304c02
2 parents f2fe812 + f0d4b73
commit 1304c02
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Resources/lang/it/settings.php b/Resources/lang/it/settings.php
@@ -2,7 +2,7 @@
 
 return [
     'title' => [
-        'settings' => 'Impostazione',
+        'settings' => 'Impostazioni',
         'general settings' => 'Impostazioni generali',
         'module settings' => 'Impostazioni moduli',
         'module name settings' => 'Impostazioni modulo :module',