Merge remote-tracking branch 'upstream/develop-next' into issue/mpdf-export
Conflicts: include/class.pdf.php
Showing
- ISSUE_TEMPLATE.md 1 addition, 1 deletionISSUE_TEMPLATE.md
- README.md 1 addition, 1 deletionREADME.md
- bootstrap.php 6 additions, 0 deletionsbootstrap.php
- client.inc.php 4 additions, 0 deletionsclient.inc.php
- include/ajax.forms.php 3 additions, 1 deletioninclude/ajax.forms.php
- include/ajax.tickets.php 1 addition, 1 deletioninclude/ajax.tickets.php
- include/class.config.php 41 additions, 0 deletionsinclude/class.config.php
- include/class.dynamic_forms.php 3 additions, 4 deletionsinclude/class.dynamic_forms.php
- include/class.faq.php 2 additions, 1 deletioninclude/class.faq.php
- include/class.format.php 27 additions, 0 deletionsinclude/class.format.php
- include/class.forms.php 39 additions, 3 deletionsinclude/class.forms.php
- include/class.mailer.php 2 additions, 0 deletionsinclude/class.mailer.php
- include/class.queue.php 16 additions, 10 deletionsinclude/class.queue.php
- include/class.search.php 17 additions, 4 deletionsinclude/class.search.php
- include/class.staff.php 4 additions, 0 deletionsinclude/class.staff.php
- include/class.thread.php 45 additions, 11 deletionsinclude/class.thread.php
- include/class.ticket.php 6 additions, 6 deletionsinclude/class.ticket.php
- include/class.usersession.php 4 additions, 0 deletionsinclude/class.usersession.php
- include/class.validator.php 46 additions, 0 deletionsinclude/class.validator.php
- include/client/header.inc.php 2 additions, 1 deletioninclude/client/header.inc.php
Loading
Please register or sign in to comment