Fix merge conflicts

phpmyadmin · Sep 8, 2012 · a5d0fda · a5d0fda
2 parents 2be4178 + 7664d04
commit a5d0fda
Show file tree

Hide file tree

Showing 6 changed files with 1,976 additions and 111 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -65,6 +65,7 @@ VerboseMultiSubmit, ReplaceHelpImg
 - bug #3559955 [edit] current_date from function drop down fails on update
 - bug #3562472 add support for Solaris and FreeBSD system load and memory display in server status
 - bug #3553068 [import] Table import from XML file fails
+- replace Highcharts with jqplot for Display chart 
 
 3.5.2.2 (2012-08-12)
 - [security] Fixed XSS vulnerabilities, see PMASA-2012-4