Merge branch 'stable-3.1'

Marius Burkard

2016-03-02 2f74cf27ad6fbb852df78bcccca1fb645c8a57e0

 interface/web/sites/lib/lang/ja_web_folder_user_list.lng

@@ -3,4 +3,5 @@
$wb['active_txt'] = 'Active';
$wb['web_folder_id_txt'] = 'Folder';
$wb['username_txt'] = 'Username';
$wb['add_new_record_txt'] = 'Add new Folder User';
?>