Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-03 03d03093c9ca77befa029931e089f8abac96d3bb

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

@@ -1,5 +1,4 @@
<?php

$wb['list_head_txt'] = 'Configuration du serveur';

$wb['server_name_txt'] = 'Serveur';

?>



<?php
$wb['list_head_txt'] = 'Configuration du serveur';
$wb['server_name_txt'] = 'Serveur';
?>