Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-04-28 d1923498c73ceef785748b5464e05d8fe383e5ea

 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';
?>