From 12bf06e0166a6779b88e2c6f1a28edde546f9682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Tue, 1 Mar 2016 15:41:19 +0100
Subject: [PATCH] Add changelog for issue #12055
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 6b999d45d5..3747853332 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,6 +48,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.