Merge remote branch 'upstream-1.7/develop' into develop
Include changes from 1.7.2 Conflicts: main.inc.php
No related branches found
No related tags found
Showing
- bootstrap.php 9 additions, 6 deletionsbootstrap.php
- include/class.config.php 1 addition, 1 deletioninclude/class.config.php
- include/class.file.php 10 additions, 3 deletionsinclude/class.file.php
- include/class.format.php 17 additions, 0 deletionsinclude/class.format.php
- include/class.mailer.php 1 addition, 1 deletioninclude/class.mailer.php
- include/class.mailfetch.php 71 additions, 24 deletionsinclude/class.mailfetch.php
- include/class.mailparse.php 35 additions, 10 deletionsinclude/class.mailparse.php
- include/class.osticket.php 16 additions, 51 deletionsinclude/class.osticket.php
- include/class.ostsession.php 9 additions, 3 deletionsinclude/class.ostsession.php
- include/class.pdf.php 45 additions, 12 deletionsinclude/class.pdf.php
- include/class.thread.php 50 additions, 24 deletionsinclude/class.thread.php
- include/class.ticket.php 5 additions, 1 deletioninclude/class.ticket.php
- include/fpdf/print-logo.png 0 additions, 0 deletionsinclude/fpdf/print-logo.png
- include/staff/ticket-view.inc.php 2 additions, 2 deletionsinclude/staff/ticket-view.inc.php
- include/staff/tpl.inc.php 1 addition, 2 deletionsinclude/staff/tpl.inc.php
- setup/cli/modules/deploy.php 10 additions, 2 deletionssetup/cli/modules/deploy.php
- setup/cli/package.php 8 additions, 0 deletionssetup/cli/package.php
- setup/setup.inc.php 1 addition, 1 deletionsetup/setup.inc.php
- setup/test/run-tests.php 26 additions, 16 deletionssetup/test/run-tests.php
- setup/test/tests/class.test.php 1 addition, 0 deletionssetup/test/tests/class.test.php
Loading
Please register or sign in to comment