diff options
author | Marc Delisle <marc@infomarc.info> | 2012-05-05 14:59:51 +0400 |
---|---|---|
committer | Marc Delisle <marc@infomarc.info> | 2012-05-05 14:59:51 +0400 |
commit | f2d19ef5687068253197a06ed0a443d17192b4f9 (patch) | |
tree | 9bb13c2fd9d77107902355cd0abc4b948b3412e8 /ChangeLog | |
parent | 533ec68a6276713302df63e62284a560a8d3b87c (diff) | |
parent | 5088e86fd125f48967c4f22f668ab380afbad87c (diff) |
Fix merge conflicts
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -48,6 +48,7 @@ VerboseMultiSubmit, ReplaceHelpImg - bug #3521016 [edit] NOW() function incorrectly selected - bug [GUI] Invalid HTML code on transformation_overview.php - bug #3522930 [browse] Missing validation in Ajax mode +- bug Fix popup message on build SQL of import 3.5.1.0 (2012-05-03) - bug #3510784 [edit] Limit clause ignored when sort order is remembered |