Merge branch 'release/1.7-RC5'

c70dd20e · Peter Rotich · f2895491 · 82a8562a · c70dd20e · c70dd20e
Commit c70dd20e authored 12 years ago by Peter Rotich
--- a/scp/logout.php
+++ b/scp/logout.php
--- a/scp/logs.php
+++ b/scp/logs.php
--- a/scp/profile.php
+++ b/scp/profile.php
--- a/scp/settings.php
+++ b/scp/settings.php
--- a/scp/slas.php
+++ b/scp/slas.php
--- a/scp/staff.inc.php
+++ b/scp/staff.inc.php
--- a/scp/staff.php
+++ b/scp/staff.php
--- a/scp/teams.php
+++ b/scp/teams.php
--- a/scp/templates.php
+++ b/scp/templates.php
--- a/scp/tickets.php
+++ b/scp/tickets.php
--- a/scp/upgrade.php
+++ b/scp/upgrade.php
--- a/secure.inc.php
+++ b/secure.inc.php
--- a/setup/cleanup-codebase.sh
+++ b/setup/cleanup-codebase.sh
--- a/setup/cli/manage.php
+++ b/setup/cli/manage.php
--- a/setup/cli/modules/class.module.php
+++ b/setup/cli/modules/class.module.php
--- a/setup/cli/modules/unpack.php
+++ b/setup/cli/modules/unpack.php
--- a/setup/cli/package.php
+++ b/setup/cli/package.php
--- a/setup/inc/class.installer.php
+++ b/setup/inc/class.installer.php
--- a/setup/inc/sql/osTicket-mysql.sql
+++ b/setup/inc/sql/osTicket-mysql.sql
--- a/setup/inc/sql/osTicket-mysql.sql.md5
+++ b/setup/inc/sql/osTicket-mysql.sql.md5