Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-24 f91c070119e135abbab4f3baf62b32059443ba19

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

@@ -5,4 +5,3 @@
$wb['btn_save_txt'] = 'Mesclar arquivos agora';
$wb['btn_cancel_txt'] = 'Voltar';
?>