Merge remote branch 'upstream/develop' into develop-next
Conflicts: include/class.user.php
Showing
- README.md 15 additions, 1 deletionREADME.md
- WHATSNEW.md 28 additions, 1 deletionWHATSNEW.md
- bootstrap.php 1 addition, 4 deletionsbootstrap.php
- include/class.filter.php 1 addition, 89 deletionsinclude/class.filter.php
- include/class.orm.php 6 additions, 4 deletionsinclude/class.orm.php
- include/class.ticket.php 7 additions, 0 deletionsinclude/class.ticket.php
- include/class.user.php 11 additions, 0 deletionsinclude/class.user.php
- include/client/open.inc.php 6 additions, 2 deletionsinclude/client/open.inc.php
- include/mysql.php 0 additions, 211 deletionsinclude/mysql.php
- include/staff/email.inc.php 4 additions, 2 deletionsinclude/staff/email.inc.php
- include/staff/templates/user-lookup.tmpl.php 2 additions, 2 deletionsinclude/staff/templates/user-lookup.tmpl.php
- include/staff/templates/user.tmpl.php 1 addition, 1 deletioninclude/staff/templates/user.tmpl.php
- include/staff/ticket-open.inc.php 6 additions, 3 deletionsinclude/staff/ticket-open.inc.php
- include/staff/ticket-view.inc.php 4 additions, 3 deletionsinclude/staff/ticket-view.inc.php
- scp/tickets.php 2 additions, 11 deletionsscp/tickets.php
- setup/setup.inc.php 1 addition, 5 deletionssetup/setup.inc.php
Loading
Please register or sign in to comment