Merge branch 'develop' into develop-next
Conflicts: include/staff/template.inc.php scp/js/scp.js
No related branches found
No related tags found
Showing
- api/cron.php 1 addition, 1 deletionapi/cron.php
- api/pipe.php 1 addition, 1 deletionapi/pipe.php
- bootstrap.php 5 additions, 1 deletionbootstrap.php
- client.inc.php 1 addition, 1 deletionclient.inc.php
- include/ajax.tickets.php 3 additions, 3 deletionsinclude/ajax.tickets.php
- include/class.forms.php 25 additions, 1 deletioninclude/class.forms.php
- include/class.i18n.php 2 additions, 2 deletionsinclude/class.i18n.php
- include/class.misc.php 5 additions, 0 deletionsinclude/class.misc.php
- include/class.osticket.php 4 additions, 1 deletioninclude/class.osticket.php
- include/class.pdf.php 1 addition, 1 deletioninclude/class.pdf.php
- include/class.template.php 25 additions, 3 deletionsinclude/class.template.php
- include/class.ticket.php 16 additions, 12 deletionsinclude/class.ticket.php
- include/mysqli.php 1 addition, 1 deletioninclude/mysqli.php
- include/staff/template.inc.php 25 additions, 23 deletionsinclude/staff/template.inc.php
- include/staff/ticket-open.inc.php 18 additions, 9 deletionsinclude/staff/ticket-open.inc.php
- include/staff/tickets.inc.php 1 addition, 1 deletioninclude/staff/tickets.inc.php
- include/staff/tpl.inc.php 26 additions, 11 deletionsinclude/staff/tpl.inc.php
- pages/index.php 1 addition, 1 deletionpages/index.php
- scp/js/scp.js 7 additions, 10 deletionsscp/js/scp.js
- setup/cli/modules/deploy.php 2 additions, 2 deletionssetup/cli/modules/deploy.php
Loading
Please register or sign in to comment