updated master, resolved conflicts

A. Täffner

2016-01-22 ce6e1ddfd09c47fc3f80e4fccc238894cf560ddb

1
2
3
4
5
6
7
<?php
$wb['list_head_txt'] = 'Directive Snippets';
$wb['active_txt'] = 'Active';
$wb['name_txt'] = 'Name of Snippet';
$wb['type_txt'] = 'Type';
$wb['add_new_record_txt'] = 'Add Directive Snippet';
?>