Merge remote branch 'upstream/develop' into develop-next
Conflicts: client.inc.php include/class.file.php include/class.mailer.php include/class.staff.php include/class.thread.php include/staff/ticket-view.inc.php
Showing
- README.md 4 additions, 0 deletionsREADME.md
- WHATSNEW.md 14 additions, 0 deletionsWHATSNEW.md
- assets/default/css/theme.css 15 additions, 3 deletionsassets/default/css/theme.css
- assets/default/images/poweredby.png 0 additions, 0 deletionsassets/default/images/poweredby.png
- client.inc.php 1 addition, 1 deletionclient.inc.php
- css/rtl.css 1 addition, 1 deletioncss/rtl.css
- include/ajax.orgs.php 2 additions, 1 deletioninclude/ajax.orgs.php
- include/class.api.php 1 addition, 1 deletioninclude/class.api.php
- include/class.charset.php 75 additions, 0 deletionsinclude/class.charset.php
- include/class.config.php 10 additions, 0 deletionsinclude/class.config.php
- include/class.file.php 13 additions, 12 deletionsinclude/class.file.php
- include/class.format.php 4 additions, 37 deletionsinclude/class.format.php
- include/class.mailfetch.php 2 additions, 2 deletionsinclude/class.mailfetch.php
- include/class.mailparse.php 2 additions, 2 deletionsinclude/class.mailparse.php
- include/class.misc.php 25 additions, 8 deletionsinclude/class.misc.php
- include/class.ostsession.php 17 additions, 0 deletionsinclude/class.ostsession.php
- include/class.thread.php 14 additions, 4 deletionsinclude/class.thread.php
- include/class.ticket.php 9 additions, 11 deletionsinclude/class.ticket.php
- include/class.translation.php 3 additions, 4 deletionsinclude/class.translation.php
- include/class.usersession.php 8 additions, 0 deletionsinclude/class.usersession.php
Loading
Please register or sign in to comment