Merge branch 'QA_4_6'

2016-03-01 15:41:36 +01:00 · 2016-03-01 15:41:36 +01:00 · eb536f2c76
commit eb536f2c76
parent 4dce6ec2db 12bf06e016
1 changed files with 1 additions and 0 deletions
--- a/1
+++ b/1
@ -56,6 +56,7 @@ phpMyAdmin - ChangeLog
 - issue #11850 Fixed CSV import
 - issue        Fix SQL syntax highlighting in database search page
 - issue #12056 Fix error when we can not generate random string
+- issue #12055 Fixed PHP syntax error in templates

 4.5.5.1 (not yet released)
 - issue #11971 CREATE UNIQUE INDEX index type is not recognized by parser.