Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-04 f6513f0be58f1dd441f3778f8a9d259bbc7267e4

 interface/web/admin/lib/lang/fr_server_config_list.lng

@@ -1,4 +1,4 @@
<?php
$wb['list_head_txt'] = 'Server Configuration';
$wb['server_name_txt'] = 'Server';
$wb['list_head_txt'] = 'Configuration du serveur';
$wb['server_name_txt'] = 'Serveur';
?>