From 360878b6a99dc419c9c2e40ec77bb2922e47d17a Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 3 May 2013 08:13:50 -0400 Subject: [PATCH] Fix merge conflict --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 48c65277e2..d222ea0b52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,7 +15,7 @@ phpMyAdmin - ChangeLog - bug #3901 Setup script warning for config auth (stored login data) shows link BBcode - bug #3895 [browse] Fixed getting BLOB data -4.0.0.0 (not yet released) +4.0.0.0 (2013-05-03) + Patch #3481047 for rfe #3480477 Insert as new row enhancement + Patch #3480999 Activate codemirror in the query window - Patch #3495284 XML Import - fix message and redirect