From 3b0323dda3d4685259c0c501affed1a2b3cd8739 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 15 Feb 2013 07:26:32 -0500 Subject: [PATCH] Fix merge conflicts --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fc10ec9deb..bd2d4ecafd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,7 +3,7 @@ phpMyAdmin - ChangeLog 3.5.8.0 (not yet released) -3.5.7.0 (not yet released) +3.5.7.0 (2013-02-15) - bug #3779 [core] Problem with backslash in enum fields - bug #3816 Missing server_processlist.php - bug #3821 Safari: white page