Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 05beae43cfeb15ea89b984d36105dcdbdffd0975

1
2
3
4
<?php
$wb['welcome_user_txt'] = 'Buongiorno %s';
$wb['available_modules_txt'] = 'Moduli disponibili';
?>