Merge remote branch 'upstream/develop-next' into feature/list-management
Conflicts: include/staff/tickets.inc.php
No related branches found
No related tags found
Showing
- include/ajax.forms.php 2 additions, 0 deletionsinclude/ajax.forms.php
- include/class.dynamic_forms.php 22 additions, 1 deletioninclude/class.dynamic_forms.php
- include/class.group.php 4 additions, 0 deletionsinclude/class.group.php
- include/class.setup.php 6 additions, 2 deletionsinclude/class.setup.php
- include/class.staff.php 8 additions, 1 deletioninclude/class.staff.php
- include/client/open.inc.php 1 addition, 8 deletionsinclude/client/open.inc.php
- include/pear/Mail.php 5 additions, 6 deletionsinclude/pear/Mail.php
- include/staff/helptopic.inc.php 20 additions, 17 deletionsinclude/staff/helptopic.inc.php
- include/staff/settings-tickets.inc.php 1 addition, 1 deletioninclude/staff/settings-tickets.inc.php
- include/staff/templates/dynamic-form-fields-view.tmpl.php 40 additions, 0 deletionsinclude/staff/templates/dynamic-form-fields-view.tmpl.php
- include/staff/ticket-open.inc.php 1 addition, 8 deletionsinclude/staff/ticket-open.inc.php
- include/staff/tickets.inc.php 5 additions, 2 deletionsinclude/staff/tickets.inc.php
- include/upgrader/streams/core/03ff59bf-b26f29a6.patch.sql 1 addition, 1 deletioninclude/upgrader/streams/core/03ff59bf-b26f29a6.patch.sql
- include/upgrader/streams/core/15b30765-dd0022fb.task.php 3 additions, 0 deletionsinclude/upgrader/streams/core/15b30765-dd0022fb.task.php
- include/upgrader/streams/core/36f6b328-5cd0a25a.patch.sql 2 additions, 1 deletioninclude/upgrader/streams/core/36f6b328-5cd0a25a.patch.sql
- scp/helptopics.php 3 additions, 2 deletionsscp/helptopics.php
Loading
Please register or sign in to comment