From 14bfb4cead96d33f18d9385ec1145ea8d13e057f Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 13 Jun 2013 13:42:39 -0400 Subject: [PATCH] Fix merge conflict --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2baa47e3e0..9abf79921b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,8 @@ phpMyAdmin - ChangeLog - bug #3962 Proper escaping of JSON export + rfe #1328 Optional ReCAPTCHA support +4.0.5.0 (not yet released) + 4.0.4.0 (not yet released) - bug #3959 Using DefaultTabDatabase in NavigationTree for Database Click - bug #3961 Avoid Suhosin warning when in simulation mode