From 2acbba64b3b0fc7553cb36197e19f3214cf373bd Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 12 Feb 2013 14:56:01 -0500 Subject: [PATCH] Fix merge conflict --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index c24741a244..20c164a50d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -90,6 +90,8 @@ VerboseMultiSubmit, ReplaceHelpImg - bug #3762 [core] Make Advisor work on Windows withou COM extension. - bug #3519 [export] Prevent infinite recursion in PDF export. +3.5.8.0 (not yet released) + 3.5.7.0 (not yet released) - bug #3779 [core] Problem with backslash in enum fields - bug #3816 Missing server_processlist.php