Merge branch 'release/1.7-RC5'

c70dd20e · Peter Rotich · f2895491 · 82a8562a · c70dd20e · c70dd20e
Commit c70dd20e authored 12 years ago by Peter Rotich
--- a/scp/banlist.php
+++ b/scp/banlist.php
--- a/scp/canned.php
+++ b/scp/canned.php
--- a/scp/categories.php
+++ b/scp/categories.php
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
--- a/scp/dashboard.php
+++ b/scp/dashboard.php
--- a/scp/departments.php
+++ b/scp/departments.php
--- a/scp/directory.php
+++ b/scp/directory.php
--- a/scp/emails.php
+++ b/scp/emails.php
--- a/scp/emailtest.php
+++ b/scp/emailtest.php
--- a/scp/faq.php
+++ b/scp/faq.php
--- a/scp/file.php
+++ b/scp/file.php
--- a/scp/filters.php
+++ b/scp/filters.php
--- a/scp/groups.php
+++ b/scp/groups.php
--- a/scp/helptopics.php
+++ b/scp/helptopics.php
--- a/scp/index.php
+++ b/scp/index.php
--- a/scp/js/ticket.js
+++ b/scp/js/ticket.js
--- a/scp/js/ticket.min.js
+++ b/scp/js/ticket.min.js
--- a/scp/kb.php
+++ b/scp/kb.php
--- a/scp/l.php
+++ b/scp/l.php
--- a/scp/login.php
+++ b/scp/login.php