From e46884a15ae530a99f5f558383fa1c485c3a2a59 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 24 Sep 2012 07:19:11 -0400 Subject: [PATCH] Fix merge conflicts --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 8682c8bd0e..936604589b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,8 @@ VerboseMultiSubmit, ReplaceHelpImg + rfe #3528994 [interface] Allow wrapping possibly long values in replication-status table + [interface] Autoselect username input on cookie login page +3.5.4.0 (not yet released) + 3.5.3.0 (not yet released) - bug #3539044 [interface] Browse mode "Show" button gives blank page if no results anymore - bug #3534979 [interface] Copy Database Ajax feedback vanishes long before copying is done