updated master, resolved conflicts

A. Täffner

2016-01-22 ce6e1ddfd09c47fc3f80e4fccc238894cf560ddb

1
2
3
4
5
6
7
<?php
$wb["list_head_txt"] = 'ISPConfig Log';
$wb["tstamp_txt"] = 'Date';
$wb["server_id_txt"] = 'Server';
$wb["loglevel_txt"] = 'Loglevel';
$wb["message_txt"] = 'Message';
?>