Merge remote-tracking branch 'upstream/v1.9.11' into develop-next
Conflicts: WHATSNEW.md include/class.dynamic_forms.php include/class.mailer.php include/class.thread.php include/class.ticket.php include/staff/filter.inc.php
No related branches found
No related tags found
Showing
- WHATSNEW.md 16 additions, 0 deletionsWHATSNEW.md
- include/class.cli.php 1 addition, 1 deletioninclude/class.cli.php
- include/class.dynamic_forms.php 2 additions, 0 deletionsinclude/class.dynamic_forms.php
- include/class.filter_action.php 1 addition, 1 deletioninclude/class.filter_action.php
- include/class.format.php 1 addition, 1 deletioninclude/class.format.php
- include/class.search.php 8 additions, 3 deletionsinclude/class.search.php
- include/class.signal.php 1 addition, 1 deletioninclude/class.signal.php
- include/class.ticket.php 23 additions, 18 deletionsinclude/class.ticket.php
- include/class.topic.php 1 addition, 1 deletioninclude/class.topic.php
- include/class.variable.php 3 additions, 2 deletionsinclude/class.variable.php
- include/cli/modules/deploy.php 1 addition, 1 deletioninclude/cli/modules/deploy.php
- include/cli/modules/unpack.php 1 addition, 1 deletioninclude/cli/modules/unpack.php
- scp/tickets.php 1 addition, 1 deletionscp/tickets.php
Loading
Please register or sign in to comment