From d212e1a3ea0ae73f8305db24b386daae0d3ff58e Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 3 May 2012 12:34:08 -0400 Subject: [PATCH] Fix merge conflicts --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 38e759bedb..96ea8b20a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,7 +8,7 @@ phpMyAdmin - ChangeLog - bug [GUI] Invalid HTML code on transformation_overview.php - bug #3522930 [browse] Missing validation in Ajax mode -3.5.1.0 (not yet released) +3.5.1.0 (2012-05-03) - bug #3510784 [edit] Limit clause ignored when sort order is remembered - bug #3511471 [interface] View name not seen in navi panel (MySQL 5.1) - bug #3512916 [display] Right frame reloads after displaying SQL result(zero rows)