Merge remote-tracking branch 'upstream/develop' into feature/mysqli
Conflicts: setup/inc/class.installer.php
No related branches found
No related tags found
Showing
- include/class.log.php 2 additions, 2 deletionsinclude/class.log.php
- include/class.migrater.php 13 additions, 14 deletionsinclude/class.migrater.php
- include/class.ostsession.php 1 addition, 1 deletioninclude/class.ostsession.php
- include/class.ticket.php 5 additions, 2 deletionsinclude/class.ticket.php
- include/staff/staffmembers.inc.php 1 addition, 1 deletioninclude/staff/staffmembers.inc.php
- include/staff/tickets.inc.php 6 additions, 15 deletionsinclude/staff/tickets.inc.php
- include/upgrader/prereq.inc.php 1 addition, 1 deletioninclude/upgrader/prereq.inc.php
- include/upgrader/sql/c00511c7-7be60a84.patch.sql 14 additions, 14 deletionsinclude/upgrader/sql/c00511c7-7be60a84.patch.sql
- include/upgrader/sql/c0fd16f4-d959a00e.patch.sql 0 additions, 0 deletionsinclude/upgrader/sql/c0fd16f4-d959a00e.patch.sql
- include/upgrader/sql/d959a00e-32de1766.patch.sql 15 additions, 0 deletionsinclude/upgrader/sql/d959a00e-32de1766.patch.sql
- main.inc.php 1 addition, 1 deletionmain.inc.php
- setup/inc/class.installer.php 41 additions, 12 deletionssetup/inc/class.installer.php
- setup/inc/sql/osTicket-mysql.sql 134 additions, 137 deletionssetup/inc/sql/osTicket-mysql.sql
- setup/inc/sql/osTicket-mysql.sql.md5 1 addition, 1 deletionsetup/inc/sql/osTicket-mysql.sql.md5
- setup/scripts/rcron.php 5 additions, 5 deletionssetup/scripts/rcron.php
Loading
Please register or sign in to comment