Merge remote branch 'upstream/develop' into develop-next
Conflicts: include/class.export.php include/client/login.inc.php include/staff/ticket-view.inc.php
No related branches found
No related tags found
Showing
- include/ajax.tickets.php 3 additions, 0 deletionsinclude/ajax.tickets.php
- include/class.export.php 1 addition, 1 deletioninclude/class.export.php
- include/class.mailer.php 5 additions, 3 deletionsinclude/class.mailer.php
- include/class.osticket.php 1 addition, 1 deletioninclude/class.osticket.php
- include/client/login.inc.php 4 additions, 3 deletionsinclude/client/login.inc.php
- include/i18n/en_US/help/tips/manage.filter.yaml 2 additions, 2 deletionsinclude/i18n/en_US/help/tips/manage.filter.yaml
- include/i18n/en_US/help/tips/settings.ticket.yaml 1 addition, 1 deletioninclude/i18n/en_US/help/tips/settings.ticket.yaml
- include/staff/ticket-view.inc.php 2 additions, 3 deletionsinclude/staff/ticket-view.inc.php
- include/staff/tickets.inc.php 1 addition, 1 deletioninclude/staff/tickets.inc.php
- js/redactor-osticket.js 7 additions, 0 deletionsjs/redactor-osticket.js
Loading
Please register or sign in to comment