Missed conflict resolved from merge

Marius Cramer

2014-02-18 030bb96e51a32a7c425bdb29db9716bfbe458922

1
2
3
4
<?php
$wb['welcome_user_txt'] = 'Selamat Datang %s';
$wb['available_modules_txt'] = 'Modul yang tersedia';
?>