Merge remote branch 'upstream/v1.9.8.1' into develop-next
Conflicts: WHATSNEW.md include/class.dynamic_forms.php include/class.forms.php include/class.thread.php include/i18n/en_US/help/tips/settings.email.yaml include/staff/tickets.inc.php scp/tickets.php
No related branches found
No related tags found
Showing
- WHATSNEW.md 8 additions, 0 deletionsWHATSNEW.md
- include/class.config.php 6 additions, 0 deletionsinclude/class.config.php
- include/class.ostsession.php 1 addition, 1 deletioninclude/class.ostsession.php
- include/class.search.php 2 additions, 0 deletionsinclude/class.search.php
- include/class.staff.php 1 addition, 1 deletioninclude/class.staff.php
- include/class.thread.php 11 additions, 3 deletionsinclude/class.thread.php
- include/class.validator.php 9 additions, 3 deletionsinclude/class.validator.php
- include/i18n/en_US/help/tips/settings.email.yaml 8 additions, 0 deletionsinclude/i18n/en_US/help/tips/settings.email.yaml
- include/pear/Mail/mimeDecode.php 1 addition, 0 deletionsinclude/pear/Mail/mimeDecode.php
- include/staff/settings-emails.inc.php 9 additions, 0 deletionsinclude/staff/settings-emails.inc.php
- include/upgrader/streams/core/c00511c7-7be60a84.task.php 2 additions, 1 deletioninclude/upgrader/streams/core/c00511c7-7be60a84.task.php
Loading
Please register or sign in to comment