From ebe2a318191706381dc4a03a8a612944786abfa2 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 24 May 2013 12:40:50 -0400 Subject: [PATCH] Fix merge conflict --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6c5d0ec1c2..121ac219e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,7 +7,7 @@ phpMyAdmin - ChangeLog - bug #3927 List of tables is missing after expanding in the navigation frame - bug #3942 Warnings about reserved word for many non reserved words -4.0.2.0 (not yet released) +4.0.2.0 (2013-05-24) - bug #3902 Cannot browse when table name contains keyword "call" + center loading indicator for navigation refresh, related to bug #3920 - bug #3925 Table sorting in navigation panel is case-sensitive