Merge remote-tracking branch 'upstream-1.7/develop' into develop
Pull changes from osTicket 1.7.1 Conflicts: main.inc.php
No related branches found
No related tags found
Showing
- README.md 6 additions, 0 deletionsREADME.md
- WHATSNEW.md 69 additions, 0 deletionsWHATSNEW.md
- bootstrap.php 5 additions, 4 deletionsbootstrap.php
- include/api.tickets.php 7 additions, 2 deletionsinclude/api.tickets.php
- include/class.api.php 0 additions, 5 deletionsinclude/class.api.php
- include/class.csrf.php 2 additions, 7 deletionsinclude/class.csrf.php
- include/class.email.php 5 additions, 0 deletionsinclude/class.email.php
- include/class.filter.php 4 additions, 2 deletionsinclude/class.filter.php
- include/class.mailer.php 19 additions, 7 deletionsinclude/class.mailer.php
- include/class.mailfetch.php 43 additions, 23 deletionsinclude/class.mailfetch.php
- include/class.mailparse.php 20 additions, 0 deletionsinclude/class.mailparse.php
- include/class.osticket.php 1 addition, 1 deletioninclude/class.osticket.php
- include/class.setup.php 1 addition, 1 deletioninclude/class.setup.php
- include/class.staff.php 4 additions, 3 deletionsinclude/class.staff.php
- include/class.thread.php 158 additions, 3 deletionsinclude/class.thread.php
- include/class.ticket.php 47 additions, 23 deletionsinclude/class.ticket.php
- include/class.upgrader.php 29 additions, 0 deletionsinclude/class.upgrader.php
- include/class.usersession.php 1 addition, 1 deletioninclude/class.usersession.php
- include/class.validator.php 11 additions, 2 deletionsinclude/class.validator.php
- include/class.variable.php 9 additions, 9 deletionsinclude/class.variable.php
Loading
Please register or sign in to comment