-
Jared Hancock authored
Merging feature/multilingual-phase-ii Conflicts: include/class.config.php include/class.dynamic_forms.php include/class.forms.php include/class.ticket.php include/staff/dynamic-list.inc.php include/staff/dynamic-lists.inc.php include/staff/filter.inc.php include/staff/helptopic.inc.php include/staff/settings-tickets.inc.php include/staff/templates/list-item-properties.tmpl.php include/staff/ticket-view.inc.php scp/lists.php scp/tickets.php
5542fb86